From 1eaba4195ef08af72d0f017ee7cd0cb01bd7dfe4 Mon Sep 17 00:00:00 2001
From: Gyuho Lee <gyuhox@gmail.com>
Date: Mon, 18 Jun 2018 13:23:59 -0700
Subject: [PATCH 1/3] travis: remove unit tests, run grpcproxy, coverage tests

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
---
 .travis.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 62b1a29bd..6e1afadf2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,18 +20,20 @@ env:
   - 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.10.3
+    env: TARGET=linux-amd64-grpcproxy
+  - go: 1.10.3
+    env: TARGET=linux-amd64-coverage
   - go: tip
     env: TARGET=linux-amd64-fmt-unit-go-tip
-  - go: 1.10.3
-    env: TARGET=linux-386-unit
   exclude:
   - go: tip
     env: TARGET=linux-amd64-fmt
@@ -47,10 +49,12 @@ matrix:
     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.10.3
     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
@@ -87,11 +91,6 @@ script:
           --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
           /bin/bash -c "./build && GOARCH=amd64 PASSES='functional' ./test"
         ;;
-      linux-amd64-unit)
-        docker run --rm \
-          --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
-          /bin/bash -c "GOARCH=amd64 PASSES='unit' ./test"
-        ;;
       all-build)
         docker run --rm \
           --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
@@ -103,12 +102,13 @@ script:
             && GO_BUILD_FLAGS='-v' GOARCH=arm64 ./build \
             && GO_BUILD_FLAGS='-v' GOARCH=ppc64le ./build"
         ;;
+      linux-amd64-grpcproxy)
+        sudo HOST_TMP_DIR=/tmp TEST_OPTS="PASSES='build grpcproxy'" make docker-test
+        ;;
+      linux-amd64-coverage)
+        sudo HOST_TMP_DIR=/tmp make docker-test-coverage
+        ;;
       linux-amd64-fmt-unit-go-tip)
         GOARCH=amd64 PASSES='fmt unit' ./test
         ;;
-      linux-386-unit)
-        docker run --rm \
-          --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
-          /bin/bash -c "GOARCH=386 PASSES='unit' ./test"
-        ;;
     esac

From 6931e9dd23e6294c47b0badd661dcea145a276ec Mon Sep 17 00:00:00 2001
From: Gyuho Lee <gyuhox@gmail.com>
Date: Mon, 18 Jun 2018 13:24:20 -0700
Subject: [PATCH 2/3] tests/semaphore: remove coverage, grpcproxy tests, add
 unit tests

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
---
 tests/semaphore.test.bash | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/tests/semaphore.test.bash b/tests/semaphore.test.bash
index 2c427fac9..ab0fb4c3a 100755
--- a/tests/semaphore.test.bash
+++ b/tests/semaphore.test.bash
@@ -7,28 +7,17 @@ fi
 
 <<COMMENT
 # amd64-e2e
-bash tests/semaphore.test.bash
+tests/semaphore.test.bash
+sudo HOST_TMP_DIR=/tmp TEST_OPTS="PASSES='build release e2e' MANUAL_VER=v3.3.7" make docker-test
 
 # 386-e2e
-TEST_ARCH=386 bash tests/semaphore.test.bash
+sudo HOST_TMP_DIR=/tmp TEST_OPTS="GOARCH=386 PASSES='build e2e'" make docker-test
 
-# grpc-proxy
-TEST_OPTS="PASSES='build grpcproxy'" bash tests/semaphore.test.bash
+# amd64-unit
+sudo HOST_TMP_DIR=/tmp TEST_OPTS="GOARCH=amd64 PASSES='unit'" make docker-test
 
-# coverage
-TEST_OPTS="coverage" bash tests/semaphore.test.bash
+# 386-unit
+sudo HOST_TMP_DIR=/tmp TEST_OPTS="GOARCH=386 PASSES='unit'" make docker-test
 COMMENT
 
-if [ -z "${TEST_OPTS}" ]; then
-	TEST_OPTS="PASSES='build release e2e' MANUAL_VER=v3.3.7"
-fi
-if [ "${TEST_ARCH}" == "386" ]; then
-  TEST_OPTS="GOARCH=386 PASSES='build e2e'"
-fi
-
-echo "Running tests with" ${TEST_OPTS}
-if [ "${TEST_OPTS}" == "coverage" ]; then
-  sudo HOST_TMP_DIR=/tmp make docker-test-coverage
-else
-  sudo HOST_TMP_DIR=/tmp TEST_OPTS="${TEST_OPTS}" make docker-test
-fi
+sudo HOST_TMP_DIR=/tmp TEST_OPTS="PASSES='build release e2e' MANUAL_VER=v3.3.7" make docker-test

From f3ec7d2aed579cb8bcd63c307f81fc962419b67a Mon Sep 17 00:00:00 2001
From: Gyuho Lee <gyuhox@gmail.com>
Date: Mon, 18 Jun 2018 13:34:14 -0700
Subject: [PATCH 3/3] tests: move "amd64-unit" to travis

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
---
 .travis.yml               | 16 ++++++++++++++++
 tests/semaphore.test.bash |  6 ------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6e1afadf2..c6036ff3e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,10 +20,12 @@ env:
   - 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
@@ -34,6 +36,8 @@ matrix:
     env: TARGET=linux-amd64-coverage
   - go: tip
     env: TARGET=linux-amd64-fmt-unit-go-tip
+  - go: 1.10.3
+    env: TARGET=linux-386-unit
   exclude:
   - go: tip
     env: TARGET=linux-amd64-fmt
@@ -55,6 +59,8 @@ matrix:
     env: TARGET=linux-amd64-coverage
   - go: 1.10.3
     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
@@ -91,6 +97,11 @@ script:
           --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
           /bin/bash -c "./build && GOARCH=amd64 PASSES='functional' ./test"
         ;;
+      linux-amd64-unit)
+        docker run --rm \
+          --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
+          /bin/bash -c "GOARCH=amd64 PASSES='unit' ./test"
+        ;;
       all-build)
         docker run --rm \
           --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
@@ -111,4 +122,9 @@ script:
       linux-amd64-fmt-unit-go-tip)
         GOARCH=amd64 PASSES='fmt unit' ./test
         ;;
+      linux-386-unit)
+        docker run --rm \
+          --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
+          /bin/bash -c "GOARCH=386 PASSES='unit' ./test"
+        ;;
     esac
diff --git a/tests/semaphore.test.bash b/tests/semaphore.test.bash
index ab0fb4c3a..f171d7563 100755
--- a/tests/semaphore.test.bash
+++ b/tests/semaphore.test.bash
@@ -12,12 +12,6 @@ sudo HOST_TMP_DIR=/tmp TEST_OPTS="PASSES='build release e2e' MANUAL_VER=v3.3.7"
 
 # 386-e2e
 sudo HOST_TMP_DIR=/tmp TEST_OPTS="GOARCH=386 PASSES='build e2e'" make docker-test
-
-# amd64-unit
-sudo HOST_TMP_DIR=/tmp TEST_OPTS="GOARCH=amd64 PASSES='unit'" make docker-test
-
-# 386-unit
-sudo HOST_TMP_DIR=/tmp TEST_OPTS="GOARCH=386 PASSES='unit'" make docker-test
 COMMENT
 
 sudo HOST_TMP_DIR=/tmp TEST_OPTS="PASSES='build release e2e' MANUAL_VER=v3.3.7" make docker-test