From 91c890b1e13d902973bbf122ff12dda729cfbaba Mon Sep 17 00:00:00 2001
From: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
Date: Fri, 23 Aug 2019 11:17:07 +0300
Subject: [PATCH] ci: adapt to go mod

switch go mod on explicitly in CI

travisci: enable caching of Go modules

travisci: drop obsolete hack
---
 .travis.yml | 8 +++++---
 Jenkinsfile | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 63e97c55..359127cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,11 +5,16 @@ dist: xenial
 go:
   - 1.12.x
 
+cache:
+  directories:
+    - $GOPATH/pkg/mod
+
 env:
   global:
     - RUNC_VERSION=v1.0.0-rc8
     - CRIO_VERSION=v1.14.6
     - BUILDAH_VERSION=v1.10.0
+    - GO111MODULE=on
 
 sudo: required
 
@@ -18,9 +23,6 @@ before_install:
   - go get -v golang.org/x/lint/golint
   - go get -v github.com/fzipp/gocyclo
   - go get -v golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow
-  ## hack for building on forks
-  - repo=`basename $PWD`; src=`dirname $PWD`; dest="`dirname $src`/intel"
-  - if [[ "$src" != "$dest" ]]; then mv "$src" "$dest"; cd ../../intel/$repo; export TRAVIS_BUILD_DIR=`dirname $TRAVIS_BUILD_DIR`/$repo; fi
   ## install buildah build deps
   - cdir=$(pwd)
   - sudo apt-get update
diff --git a/Jenkinsfile b/Jenkinsfile
index 1bfb7463..5be02579 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,10 +6,11 @@ pipeline {
     timeout(time: 2, unit: "HOURS")
   }
   environment {
+    GO111MODULE="on"
     RUNC_VERSION="v1.0.0-rc8"
     CRIO_VERSION="v1.14.6"
     BUILDAH_VERSION="v1.10.0"
-    GO_VERSION="1.12.8"
+    GO_VERSION="1.12.9"
     GO_TAR="go${GO_VERSION}.linux-amd64.tar.gz"
     GOROOT="/usr/local/go"
     GOPATH="/tmp/go"