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] 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