*: update test Go version / release version

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
etcd-io · Sep 6, 2019 · 42ad719 · 42ad719
1 parent 64b3e59
commit 42ad719
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 54 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,71 +6,71 @@ sudo: required
 services: docker
 
 go:
-- 1.12.9
-- tip
+  - 1.13
+  - tip
 
 notifications:
   on_success: never
   on_failure: never
 
 env:
   matrix:
-  - TARGET=linux-amd64-fmt
-  - TARGET=linux-amd64-integration-1-cpu
-  - TARGET=linux-amd64-integration-2-cpu
-  - TARGET=linux-amd64-integration-4-cpu
-  - TARGET=linux-amd64-functional
-  - TARGET=linux-amd64-unit
-  - TARGET=all-build
-  - TARGET=linux-amd64-grpcproxy
-  - TARGET=linux-amd64-coverage
-  - TARGET=linux-amd64-fmt-unit-go-tip
-  - TARGET=linux-386-unit
+    - TARGET=linux-amd64-fmt
+    - TARGET=linux-amd64-integration-1-cpu
+    - TARGET=linux-amd64-integration-2-cpu
+    - TARGET=linux-amd64-integration-4-cpu
+    - TARGET=linux-amd64-functional
+    - TARGET=linux-amd64-unit
+    - TARGET=all-build
+    - TARGET=linux-amd64-grpcproxy
+    - TARGET=linux-amd64-coverage
+    - TARGET=linux-amd64-fmt-unit-go-tip
+    - TARGET=linux-386-unit
 
 matrix:
   fast_finish: true
   allow_failures:
-  - go: 1.12.9
-    env: TARGET=linux-amd64-grpcproxy
-  - go: 1.12.9
-    env: TARGET=linux-amd64-coverage
-  - go: tip
-    env: TARGET=linux-amd64-fmt-unit-go-tip
-  - go: 1.12.9
-    env: TARGET=linux-386-unit
+    - go: 1.13
+      env: TARGET=linux-amd64-grpcproxy
+    - go: 1.13
+      env: TARGET=linux-amd64-coverage
+    - go: tip
+      env: TARGET=linux-amd64-fmt-unit-go-tip
+    - go: 1.13
+      env: TARGET=linux-386-unit
   exclude:
-  - go: tip
-    env: TARGET=linux-amd64-fmt
-  - go: tip
-    env: TARGET=linux-amd64-integration-1-cpu
-  - go: tip
-    env: TARGET=linux-amd64-integration-2-cpu
-  - go: tip
-    env: TARGET=linux-amd64-integration-4-cpu
-  - go: tip
-    env: TARGET=linux-amd64-functional
-  - go: tip
-    env: TARGET=linux-amd64-unit
-  - go: tip
-    env: TARGET=all-build
-  - go: tip
-    env: TARGET=linux-amd64-grpcproxy
-  - go: tip
-    env: TARGET=linux-amd64-coverage
-  - go: 1.12.9
-    env: TARGET=linux-amd64-fmt-unit-go-tip
-  - go: tip
-    env: TARGET=linux-386-unit
+    - go: tip
+      env: TARGET=linux-amd64-fmt
+    - go: tip
+      env: TARGET=linux-amd64-integration-1-cpu
+    - go: tip
+      env: TARGET=linux-amd64-integration-2-cpu
+    - go: tip
+      env: TARGET=linux-amd64-integration-4-cpu
+    - go: tip
+      env: TARGET=linux-amd64-functional
+    - go: tip
+      env: TARGET=linux-amd64-unit
+    - go: tip
+      env: TARGET=all-build
+    - go: tip
+      env: TARGET=linux-amd64-grpcproxy
+    - go: tip
+      env: TARGET=linux-amd64-coverage
+    - go: 1.13
+      env: TARGET=linux-amd64-fmt-unit-go-tip
+    - go: tip
+      env: TARGET=linux-386-unit
 
 before_install:
-- if [[ $TRAVIS_GO_VERSION == 1.* ]]; then docker pull gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION}; fi
+  - if [[ $TRAVIS_GO_VERSION == 1.* ]]; then docker pull gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION}; fi
 
 install:
-- go get -t -v -d ./...
+  - go get -t -v -d ./...
 
 script:
- - echo "TRAVIS_GO_VERSION=${TRAVIS_GO_VERSION}"
- - >
+  - echo "TRAVIS_GO_VERSION=${TRAVIS_GO_VERSION}"
+  - >
     case "${TARGET}" in
       linux-amd64-fmt)
         docker run --rm \

diff --git a/Makefile b/Makefile
@@ -51,7 +51,7 @@ docker-remove:
 
 
 
-GO_VERSION ?= 1.12.9
+GO_VERSION ?= 1.13
 ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound")
 
 TEST_SUFFIX = $(shell date +%s | base64 | head -c 15)
@@ -65,11 +65,11 @@ endif
 
 
 # Example:
-#   GO_VERSION=1.12.9 make build-docker-test
+#   GO_VERSION=1.13 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.12.9 make push-docker-test
+#   GO_VERSION=1.13 make push-docker-test
 #   make push-docker-test
 #
 #   gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com

diff --git a/functional/scripts/docker-local-agent.sh b/functional/scripts/docker-local-agent.sh
@@ -13,7 +13,7 @@ if ! [[ "${0}" =~ "scripts/docker-local-agent.sh" ]]; then
 fi
 
 if [[ -z "${GO_VERSION}" ]]; then
-  GO_VERSION=1.12.9
+  GO_VERSION=1.13
 fi
 echo "Running with GO_VERSION:" ${GO_VERSION}
 

diff --git a/functional/scripts/docker-local-tester.sh b/functional/scripts/docker-local-tester.sh
@@ -6,7 +6,7 @@ if ! [[ "${0}" =~ "scripts/docker-local-tester.sh" ]]; then
 fi
 
 if [[ -z "${GO_VERSION}" ]]; then
-  GO_VERSION=1.12.9
+  GO_VERSION=1.13
 fi
 echo "Running with GO_VERSION:" ${GO_VERSION}
 

diff --git a/tests/semaphore.test.bash b/tests/semaphore.test.bash
@@ -8,10 +8,10 @@ fi
 <<COMMENT
 # amd64-e2e
 tests/semaphore.test.bash
-sudo HOST_TMP_DIR=/tmp TEST_OPTS="PASSES='build release e2e' MANUAL_VER=v3.3.13" make docker-test
+sudo HOST_TMP_DIR=/tmp TEST_OPTS="PASSES='build release e2e' MANUAL_VER=v3.4.0" make docker-test
 
 # 386-e2e
 sudo HOST_TMP_DIR=/tmp TEST_OPTS="GOARCH=386 PASSES='build e2e'" make docker-test
 COMMENT
 
-sudo HOST_TMP_DIR=/tmp TEST_OPTS="PASSES='build release e2e' MANUAL_VER=v3.3.13" make docker-test
+sudo HOST_TMP_DIR=/tmp TEST_OPTS="PASSES='build release e2e' MANUAL_VER=v3.4.0" make docker-test