From 4658519a9e7d5cde6a9ae5dc4dec2e6a8460910f Mon Sep 17 00:00:00 2001 From: Joe Betz Date: Wed, 1 Nov 2017 17:01:29 -0700 Subject: [PATCH 1/2] semaphore.sh: add to release-3.1 branch --- .semaphore.sh | 16 ++++++++++++++++ .travis.yml | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100755 .semaphore.sh diff --git a/.semaphore.sh b/.semaphore.sh new file mode 100755 index 00000000000..48e5d8704da --- /dev/null +++ b/.semaphore.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +TEST_SUFFIX=$(date +%s | base64 | head -c 15) + +TEST_OPTS="RELEASE_TEST=y INTEGRATION=y PASSES='build unit release integration_e2e functional'" +if [ "$TEST_ARCH" == "386" ]; then + TEST_OPTS="GOARCH=386 PASSES='build unit integration_e2e'" +fi + +docker run \ + --rm \ + --volume=`pwd`:/go/src/github.com/coreos/etcd \ + gcr.io/etcd-development/etcd-test:go1.8.5 \ + /bin/bash -c "${TEST_OPTS} ./test 2>&1 | tee test-${TEST_SUFFIX}.log" + +! grep FAIL -A10 -B50 test-${TEST_SUFFIX}.log diff --git a/.travis.yml b/.travis.yml index 4f5e013c732..00421c25314 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ go_import_path: github.com/coreos/etcd sudo: false go: - - 1.8.3 + - 1.8.5 notifications: on_success: never From 60ff20c80cc88e4f74bd91e795357a5d35236259 Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Tue, 21 Mar 2017 17:10:59 -0700 Subject: [PATCH 2/2] client/integration: use only digits in unix port Fix https://github.com/coreos/etcd/issues/7558. Same as https://github.com/coreos/etcd/issues/6959. Signed-off-by: Gyu-Ho Lee --- client/integration/client_test.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/client/integration/client_test.go b/client/integration/client_test.go index ba4cb8b2bf3..490990b6583 100644 --- a/client/integration/client_test.go +++ b/client/integration/client_test.go @@ -34,7 +34,7 @@ import ( func TestV2NoRetryEOF(t *testing.T) { defer testutil.AfterTest(t) // generate an EOF response; specify address so appears first in sorted ep list - lEOF := integration.NewListenerWithAddr(t, fmt.Sprintf("eof:123.%d.sock", os.Getpid())) + lEOF := integration.NewListenerWithAddr(t, fmt.Sprintf("127.0.0.1:%05d", os.Getpid())) defer lEOF.Close() tries := uint32(0) go func() { @@ -65,8 +65,7 @@ func TestV2NoRetryEOF(t *testing.T) { // TestV2NoRetryNoLeader tests destructive api calls won't retry if given an error code. func TestV2NoRetryNoLeader(t *testing.T) { defer testutil.AfterTest(t) - - lHttp := integration.NewListenerWithAddr(t, fmt.Sprintf("errHttp:123.%d.sock", os.Getpid())) + lHttp := integration.NewListenerWithAddr(t, fmt.Sprintf("127.0.0.1:%05d", os.Getpid())) eh := &errHandler{errCode: http.StatusServiceUnavailable} srv := httptest.NewUnstartedServer(eh) defer lHttp.Close()