Browse Source

Merge pull request #9827 from gyuho/go

*: use Go 1.10.3 for CI tests
Gyuho Lee 7 years ago
parent
commit
61ef343166
3 changed files with 8 additions and 8 deletions
  1. 2 2
      .travis.yml
  2. 4 4
      Makefile
  3. 2 2
      tests/semaphore.test.bash

+ 2 - 2
.travis.yml

@@ -6,7 +6,7 @@ sudo: required
 services: docker
 services: docker
 
 
 go:
 go:
-- 1.10.2
+- 1.10.3
 - tip
 - tip
 
 
 notifications:
 notifications:
@@ -65,7 +65,7 @@ matrix:
     env: TARGET=linux-arm64-build
     env: TARGET=linux-arm64-build
   - go: tip
   - go: tip
     env: TARGET=linux-ppc64le-build
     env: TARGET=linux-ppc64le-build
-  - go: 1.10.2
+  - go: 1.10.3
     env: TARGET=linux-amd64-fmt-unit-go-tip
     env: TARGET=linux-amd64-fmt-unit-go-tip
 
 
 before_install:
 before_install:

+ 4 - 4
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")
 ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound")
 
 
 TEST_SUFFIX = $(shell date +%s | base64 | head -c 15)
 TEST_SUFFIX = $(shell date +%s | base64 | head -c 15)
@@ -65,16 +65,16 @@ endif
 
 
 # Example:
 # Example:
 #   GO_VERSION=1.8.7 make build-docker-test
 #   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
 #   make build-docker-test
 #
 #
 #   gcloud docker -- login -u _json_key -p "$(cat /etc/gcp-key-etcd-development.json)" https://gcr.io
 #   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.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
 #   make push-docker-test
 #
 #
 #   gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com
 #   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
 #   make pull-docker-test
 
 
 build-docker-test:
 build-docker-test:

+ 2 - 2
tests/semaphore.test.bash

@@ -7,7 +7,7 @@ fi
 
 
 TEST_SUFFIX=$(date +%s | base64 | head -c 15)
 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
 if [ "$TEST_ARCH" == "386" ]; then
   TEST_OPTS="GOARCH=386 PASSES='build e2e'"
   TEST_OPTS="GOARCH=386 PASSES='build e2e'"
 fi
 fi
@@ -15,7 +15,7 @@ fi
 docker run \
 docker run \
   --rm \
   --rm \
   --volume=`pwd`:/go/src/github.com/coreos/etcd \
   --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"
   /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
 ! egrep "(--- FAIL:|panic: test timed out|appears to have leaked)" -B50 -A10 test-${TEST_SUFFIX}.log