build: run four nodes in acceptance tests #17324
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
benesch
approved these changes
Jul 31, 2017
| @@ -268,8 +269,9 @@ upload-coverage: $(BOOTSTRAP_TARGET) | |||
| @build/upload-coverage.sh | |||
|
|
|||
| .PHONY: acceptance | |||
| acceptance: TESTTIMEOUT := $(ACCEPTANCETIMEOUT) | |||
There was a problem hiding this comment.
export TESTTIMEOUT := $(ACCEPTANCETIMEOUT) should do the same without the explicit env below!
a-robinson
approved these changes
Jul 31, 2017
| @@ -10,4 +10,4 @@ set -euxo pipefail | |||
| mkdir -p artifacts/acceptance | |||
| export TMPDIR=$PWD/artifacts/acceptance | |||
|
|
|||
| make test PKG=./pkg/acceptance TAGS=acceptance TESTFLAGS="${TESTFLAGS--v -nodes 3} -l $TMPDIR" | |||
| make test PKG=./pkg/acceptance TESTTIMEOUT="${TESTTIMEOUT-30m}" TAGS=acceptance TESTFLAGS="${TESTFLAGS--v -nodes 4} -l $TMPDIR" | |||
There was a problem hiding this comment.
Shouldn't this be ${TESTTIMEOUT:-30m} (with the :)?
There was a problem hiding this comment.
If you care about the case in which the variable is set but null? Anecdotally we're using - over :- in most places.
This is required for cockroachdb#17272 and merits a separate review.
|
|
|
This change is |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is required for
#17272
and merits a separate review.