From 7d1b3a5af8f6d22c26c938c953adf38fea56aca1 Mon Sep 17 00:00:00 2001
From: Mike Brown <brownwm@us.ibm.com>
Date: Tue, 15 Aug 2017 10:14:37 -0500
Subject: [PATCH 1/2] adding stages to test the right go versions

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
---
 .travis.yml | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6598344d9..a68a294ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,4 @@
 language: go
-go:
-    - 1.8
 
 sudo: required
 
@@ -12,11 +10,11 @@ before_install:
     - sudo sh -c "echo 'deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse' > /etc/apt/sources.list.d/backports.list"
     - sudo apt-get update
 
-install: 
+install:
     - sudo apt-get install btrfs-tools
     - sudo apt-get install libseccomp2/trusty-backports
     - sudo apt-get install libseccomp-dev/trusty-backports
-    - docker run --rm -v /usr/local/bin:/target jpetazzo/nsenter 
+    - docker run --rm -v /usr/local/bin:/target jpetazzo/nsenter
 
 before_script:
     - export PATH=$HOME/gopath/bin:$PATH
@@ -24,17 +22,33 @@ before_script:
 jobs:
   include:
     - stage: Build
-      script: 
+      script:
         - make install.tools
         - make .gitvalidation
         - make verify
         - make binaries
+      go: 1.8.x
+    - stage: Build
+      script:
+        - make install.tools
+        - make .gitvalidation
+        - make verify
+        - make binaries
+      go: tip
     - stage: Test
       script:
         - make install.deps
         - make test
         - make binaries
         - make test-cri
+      go: 1.8.x
+    - stage: Test
+      script:
+        - make install.deps
+        - make test
+        - make binaries
+        - make test-cri
+      go: tip
 
 after_script:
     # Abuse travis to preserve the log.

From f3c12edf3bfb80dec2a34d70d1b7e005281bbf76 Mon Sep 17 00:00:00 2001
From: Mike Brown <brownwm@us.ibm.com>
Date: Tue, 15 Aug 2017 14:22:38 -0500
Subject: [PATCH 2/2] parallel script execution for each go version within
 stage

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
---
 .travis.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a68a294ba..7568312f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,29 +21,25 @@ before_script:
 
 jobs:
   include:
-    - stage: Build
+    - stage: Verify
       script:
         - make install.tools
         - make .gitvalidation
         - make verify
-        - make binaries
       go: 1.8.x
-    - stage: Build
-      script:
+    - script:
         - make install.tools
         - make .gitvalidation
         - make verify
-        - make binaries
       go: tip
-    - stage: Test
+    - stage: Build and Test
       script:
         - make install.deps
         - make test
         - make binaries
         - make test-cri
       go: 1.8.x
-    - stage: Test
-      script:
+    - script:
         - make install.deps
         - make test
         - make binaries