Skip to content

Commit

Permalink
Merge pull request #67048 from rail/2go_version-21.1
Browse files Browse the repository at this point in the history
build: use go1.15 for acceptance test
  • Loading branch information
rail authored Jul 5, 2021
2 parents 21b5b06 + b5879a9 commit d22e34b
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion build/teamcity-acceptance.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,15 @@ tc_start_block "Run acceptance tests"
#
# Note that ./pkg/acceptance without the tag is an empty test package, so it's fine to compile
# outside of builder.
run_json_test env TZ=America/New_York stdbuf -eL -oL go test \
go=go
# Use older version of Go on the agent in case it's installed. See
# https://github.com/cockroachdb/cockroach/issues/66977 for the details.
if [ -x /usr/local/go1.15/bin/go ]; then
go=/usr/local/go1.15/bin/go
echo "WARN: using previous version of Go from $go"
fi

run_json_test env TZ=America/New_York stdbuf -eL -oL $go test \
-mod=vendor -json -timeout 30m -v \
-exec "../../build/teamcity-go-test-precompiled.sh ./pkg/acceptance/acceptance.test" ./pkg/acceptance \
-l "$TMPDIR"
Expand Down

0 comments on commit d22e34b

Please sign in to comment.