From e3cdd3ae9c91dc6ec09d1b6e3ec1810a570fa15a Mon Sep 17 00:00:00 2001
From: Gyuho Lee <leegyuho@amazon.com>
Date: Tue, 28 May 2019 14:57:27 -0700
Subject: [PATCH] travis: fix GO111MODULE, import paths

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
---
 .travis.yml | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6f34f24f2..8d31a93e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,12 @@
 language: go
-go_import_path: go.etcd.io/etcd/v3
+go_import_path: go.etcd.io/etcd
 
 sudo: required
 
 services: docker
 
 go:
-- 1.11.4
+- 1.12.5
 - tip
 
 notifications:
@@ -14,8 +14,6 @@ notifications:
   on_failure: never
 
 env:
-  global:
-  - GO111MODULE=on
   matrix:
   - TARGET=linux-amd64-fmt
   - TARGET=linux-amd64-integration-1-cpu
@@ -32,13 +30,13 @@ env:
 matrix:
   fast_finish: true
   allow_failures:
-  - go: 1.11.4
+  - go: 1.12.5
     env: TARGET=linux-amd64-grpcproxy
-  - go: 1.11.4
+  - go: 1.12.5
     env: TARGET=linux-amd64-coverage
   - go: tip
     env: TARGET=linux-amd64-fmt-unit-go-tip
-  - go: 1.11.4
+  - go: 1.12.5
     env: TARGET=linux-386-unit
   exclude:
   - go: tip
@@ -59,7 +57,7 @@ matrix:
     env: TARGET=linux-amd64-grpcproxy
   - go: tip
     env: TARGET=linux-amd64-coverage
-  - go: 1.11.4
+  - go: 1.12.5
     env: TARGET=linux-amd64-fmt-unit-go-tip
   - go: tip
     env: TARGET=linux-386-unit
@@ -67,45 +65,45 @@ matrix:
 before_install:
 - if [[ $TRAVIS_GO_VERSION == 1.* ]]; then docker pull gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION}; fi
 
-install: true
-
+install:
+- go get -t -v -d ./...
 
 script:
  - echo "TRAVIS_GO_VERSION=${TRAVIS_GO_VERSION}"
  - >
     case "${TARGET}" in
       linux-amd64-fmt)
-        docker run --rm -e GO111MODULE \
+        docker run --rm \
           --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
           /bin/bash -c "GOARCH=amd64 PASSES='fmt bom dep' ./test"
         ;;
       linux-amd64-integration-1-cpu)
-        docker run --rm -e GO111MODULE \
+        docker run --rm \
           --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
           /bin/bash -c "GOARCH=amd64 CPU=1 PASSES='integration' ./test"
         ;;
       linux-amd64-integration-2-cpu)
-        docker run --rm -e GO111MODULE \
+        docker run --rm \
           --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
           /bin/bash -c "GOARCH=amd64 CPU=2 PASSES='integration' ./test"
         ;;
       linux-amd64-integration-4-cpu)
-        docker run --rm -e GO111MODULE \
+        docker run --rm \
           --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
           /bin/bash -c "GOARCH=amd64 CPU=4 PASSES='integration' ./test"
         ;;
       linux-amd64-functional)
-        docker run --rm -e GO111MODULE \
+        docker run --rm \
           --volume=`pwd`:/go/src/go.etcd.io/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 -e GO111MODULE \
+        docker run --rm \
           --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
           /bin/bash -c "GOARCH=amd64 PASSES='unit' ./test"
         ;;
       all-build)
-        docker run --rm -e GO111MODULE \
+        docker run --rm \
           --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
           /bin/bash -c "GOARCH=amd64 PASSES='build' ./test \
             && GOARCH=386 PASSES='build' ./test \
@@ -125,7 +123,7 @@ script:
         GOARCH=amd64 PASSES='fmt unit' ./test
         ;;
       linux-386-unit)
-        docker run --rm -e GO111MODULE \
+        docker run --rm \
           --volume=`pwd`:/go/src/go.etcd.io/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
           /bin/bash -c "GOARCH=386 PASSES='unit' ./test"
         ;;