From 18e1686bdfbf2265cb3fa7c5072414471c26433a Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 1 May 2018 10:07:25 -0700 Subject: [PATCH 1/5] test: only print test targets in verbose mode Signed-off-by: Gyuho Lee --- test | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/test b/test index a5276276a..224d1e88c 100755 --- a/test +++ b/test @@ -82,8 +82,10 @@ fi # shellcheck disable=SC2206 FMT=($FMT) -# shellcheck disable=SC2128 -echo "Running with FMT:" "${FMT}" +if [ "${VERBOSE}" == "1" ]; then + # shellcheck disable=SC2128 + echo "Running with FMT:" "${FMT[@]}" +fi # prepend REPO_PATH to each local package split=$TEST @@ -92,16 +94,20 @@ for a in $split; do TEST="$TEST ${REPO_PATH}/${a}"; done # shellcheck disable=SC2206 TEST=($TEST) -# shellcheck disable=SC2128 -echo "Running with TEST:" "${TEST}" +if [ "${VERBOSE}" == "1" ]; then + # shellcheck disable=SC2128 + echo "Running with TEST:" "${TEST[@]}" +fi # TODO: 'client' pkg fails with gosimple from generated files # TODO: 'rafttest' is failing with unused STATIC_ANALYSIS_PATHS=$(find . -name \*.go ! -path './vendor/*' ! -path './gopath.proto/*' ! -path '*pb/*' | while read -r a; do dirname "$a"; done | sort | uniq | grep -vE "$IGNORE_PKGS" | grep -v 'client') # shellcheck disable=SC2206 STATIC_ANALYSIS_PATHS=($STATIC_ANALYSIS_PATHS) -# shellcheck disable=SC2128 -echo "Running with STATIC_ANALYSIS_PATHS:" "${STATIC_ANALYSIS_PATHS}" +if [ "${VERBOSE}" == "1" ]; then + # shellcheck disable=SC2128 + echo "Running with STATIC_ANALYSIS_PATHS:" "${STATIC_ANALYSIS_PATHS[@]}" +fi if [ -z "$GOARCH" ]; then GOARCH=$(go env GOARCH); From 79e917818109bbfd58b161aec200cd573a6517fe Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 1 May 2018 10:08:27 -0700 Subject: [PATCH 2/5] travis: use Go 1.10.2 Signed-off-by: Gyuho Lee --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e6b6a5f5..43b351c0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ sudo: required services: docker go: -- 1.10.1 +- 1.10.2 - tip notifications: @@ -65,7 +65,7 @@ matrix: env: TARGET=linux-arm64-build - go: tip env: TARGET=linux-ppc64le-build - - go: 1.10.1 + - go: 1.10.2 env: TARGET=linux-amd64-fmt-unit-go-tip before_install: From 932ef6c4a3b9536009ee776d7c8fd3b6f70bf64d Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 1 May 2018 10:08:43 -0700 Subject: [PATCH 3/5] tests: use Go 1.10.2 in Semaphore test Signed-off-by: Gyuho Lee --- tests/semaphore.test.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/semaphore.test.bash b/tests/semaphore.test.bash index 9be6fe6f1..2364a46d2 100755 --- a/tests/semaphore.test.bash +++ b/tests/semaphore.test.bash @@ -15,7 +15,7 @@ fi docker run \ --rm \ --volume=`pwd`:/go/src/github.com/coreos/etcd \ - gcr.io/etcd-development/etcd-test:go1.10.1 \ + gcr.io/etcd-development/etcd-test:go1.10.2 \ /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 From 4a01c4e98a2d95d03841d7bc8a28a9b80b16de3b Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 1 May 2018 10:09:06 -0700 Subject: [PATCH 4/5] Makefile: use Go 1.10.2 Signed-off-by: Gyuho Lee --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 96dcac593..e4d1c730b 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ docker-remove: -GO_VERSION ?= 1.10.1 +GO_VERSION ?= 1.10.2 ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound") TEST_SUFFIX = $(shell date +%s | base64 | head -c 15) @@ -62,16 +62,16 @@ endif # Example: # GO_VERSION=1.8.7 make build-docker-test -# GO_VERSION=1.9.5 make build-docker-test +# GO_VERSION=1.9.6 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.5 make push-docker-test +# GO_VERSION=1.9.6 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.5 make pull-docker-test +# GO_VERSION=1.9.6 make pull-docker-test # make pull-docker-test build-docker-test: From 1c44634f6e3a73b47d64be99b12ae49ea5da8b2c Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 1 May 2018 10:09:16 -0700 Subject: [PATCH 5/5] CHANGELOG-3.4: use Go 1.10.2 Signed-off-by: Gyuho Lee --- CHANGELOG-3.4.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG-3.4.md b/CHANGELOG-3.4.md index e060f696e..6b8435eff 100644 --- a/CHANGELOG-3.4.md +++ b/CHANGELOG-3.4.md @@ -255,7 +255,7 @@ See [security doc](https://github.com/coreos/etcd/blob/master/Documentation/op-g ### Go - Require *Go 1.10+*. -- Compile with [*Go 1.10.1*](https://golang.org/doc/devel/release.html#go1.10). +- Compile with [*Go 1.10.2*](https://golang.org/doc/devel/release.html#go1.10). ### Tooling