diff --git a/.travis.yml b/.travis.yml index 43b351c0e..e6fde1228 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ sudo: required services: docker go: -- 1.10.2 +- 1.10.3 - tip notifications: @@ -65,7 +65,7 @@ matrix: env: TARGET=linux-arm64-build - go: tip env: TARGET=linux-ppc64le-build - - go: 1.10.2 + - go: 1.10.3 env: TARGET=linux-amd64-fmt-unit-go-tip before_install: diff --git a/Makefile b/Makefile index dcb4b6835..fa65faa2a 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ docker-remove: -GO_VERSION ?= 1.10.2 +GO_VERSION ?= 1.10.3 ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound") TEST_SUFFIX = $(shell date +%s | base64 | head -c 15) @@ -65,16 +65,16 @@ endif # Example: # GO_VERSION=1.8.7 make build-docker-test -# GO_VERSION=1.9.6 make build-docker-test +# GO_VERSION=1.9.7 make build-docker-test # make build-docker-test # # gcloud docker -- login -u _json_key -p "$(cat /etc/gcp-key-etcd-development.json)" https://gcr.io # GO_VERSION=1.8.7 make push-docker-test -# GO_VERSION=1.9.6 make push-docker-test +# GO_VERSION=1.9.7 make push-docker-test # make push-docker-test # # gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com -# GO_VERSION=1.9.6 make pull-docker-test +# GO_VERSION=1.9.7 make pull-docker-test # make pull-docker-test build-docker-test: diff --git a/tests/semaphore.test.bash b/tests/semaphore.test.bash index 2364a46d2..ee085e516 100755 --- a/tests/semaphore.test.bash +++ b/tests/semaphore.test.bash @@ -7,7 +7,7 @@ fi TEST_SUFFIX=$(date +%s | base64 | head -c 15) -TEST_OPTS="PASSES='build release e2e' MANUAL_VER=v3.3.3" +TEST_OPTS="PASSES='build release e2e' MANUAL_VER=v3.3.7" if [ "$TEST_ARCH" == "386" ]; then TEST_OPTS="GOARCH=386 PASSES='build e2e'" fi @@ -15,7 +15,7 @@ fi docker run \ --rm \ --volume=`pwd`:/go/src/github.com/coreos/etcd \ - gcr.io/etcd-development/etcd-test:go1.10.2 \ + gcr.io/etcd-development/etcd-test:go1.10.3 \ /bin/bash -c "${TEST_OPTS} ./test 2>&1 | tee test-${TEST_SUFFIX}.log" ! egrep "(--- FAIL:|panic: test timed out|appears to have leaked)" -B50 -A10 test-${TEST_SUFFIX}.log