From ad3716a3140b734e6571788c0a91993a240e40a0 Mon Sep 17 00:00:00 2001
From: "Tim St. Clair" <stclair@google.com>
Date: Wed, 19 Oct 2016 15:19:15 -0700
Subject: [PATCH] Build & test cAdvisor with go 1.7.2

---
 Makefile             | 3 +++
 build/jenkins_e2e.sh | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index fd97f20e..01cf8912 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,9 @@ test:
 test-integration:
 	@./build/integration.sh
 
+test-runner:
+	@$(GO) build github.com/google/cadvisor/integration/runner
+
 format:
 	@echo ">> formatting code"
 	@$(GO) fmt $(pkgs)
diff --git a/build/jenkins_e2e.sh b/build/jenkins_e2e.sh
index 614041e8..1f5b25c0 100755
--- a/build/jenkins_e2e.sh
+++ b/build/jenkins_e2e.sh
@@ -31,8 +31,11 @@ if [[ ! -z "$(git diff --name-only pages)" ]]; then
   exit 1
 fi
 
-make
-go build -tags test github.com/google/cadvisor/integration/runner
+# Build & test with go 1.7
+docker run --rm \
+       -w "/go/src/github.com/google/cadvisor" \
+       -v "${GOPATH}/src/github.com/google/cadvisor:/go/src/github.com/google/cadvisor" \
+       golang:1.7.1 make all test-runner
 
 # Nodes that are currently stable. When tests fail on a specific node, and the failure is not remedied within a week, that node will be removed from this list.
 golden_nodes=(