From 3ffe2af1e43d76e24b51e37eed39a13d87af17c0 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Wed, 10 Jul 2019 16:13:10 -0700
Subject: [PATCH] Point docker daemon to minikube and rebuild docker image

---
 deploy/addons/gvisor/gvisor-pod.yaml.tmpl |  1 +
 hack/jenkins/common.sh                    |  6 ------
 test/integration/functional_test.go       | 13 +++++++++++++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/deploy/addons/gvisor/gvisor-pod.yaml.tmpl b/deploy/addons/gvisor/gvisor-pod.yaml.tmpl
index 17d0a2af9a..c1fe42e764 100644
--- a/deploy/addons/gvisor/gvisor-pod.yaml.tmpl
+++ b/deploy/addons/gvisor/gvisor-pod.yaml.tmpl
@@ -70,3 +70,4 @@ spec:
     hostPath:
       path: /tmp/gvisor
   restartPolicy: Always
+  imagePullPolicy: IfNotPresent
diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh
index 676c2b4295..6cc313df81 100755
--- a/hack/jenkins/common.sh
+++ b/hack/jenkins/common.sh
@@ -89,12 +89,6 @@ if [[ "${procs}" != "" ]]; then
   kill -9 ${procs} || true
 fi
 
-# Build and push gvisor image
-echo ">> Building gvisor addon image locally."
-export GVISOR_ADDON_REPO="gcr.io/k8s-minikube/integration/${MINIKUBE_LOCATION}"
-docker build -t ${GVISOR_ADDON_REPO}/gvisor-addon:latest -f testdata/gvisor-addon-Dockerfile out
-docker push ${GVISOR_ADDON_REPO}/gvisor-addon:latest
-
 # Cleanup stale test outputs.
 echo ""
 echo ">> Cleaning up after previous test runs ..."
diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index b3027b4cc0..0423cb77b3 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -19,6 +19,7 @@ limitations under the License.
 package integration
 
 import (
+	"os/exec"
 	"strings"
 	"testing"
 
@@ -61,11 +62,23 @@ func TestFunctionalContainerd(t *testing.T) {
 	}
 
 	r.Start("--container-runtime=containerd", "--docker-opt containerd=/var/run/containerd/containerd.sock")
+
+	// Build the gvisor image in Minikube
+	buildGvisorImage(t)
+
 	t.Run("Gvisor", testGvisor)
 	t.Run("GvisorRestart", testGvisorRestart)
 	r.RunCommand("delete", true)
 }
 
+func buildGvisorImage(t *testing.T) {
+	cmd := exec.Command("sh", "-c", "eval $(minikube docker-env) && docker build -t gcr.io/k8s-minikube/gvisor-addon:latest -f testdata/gvisor-addon-Dockerfile out")
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		t.Fatalf("error building gvisor addon image: %v \n %s", err, string(output))
+	}
+}
+
 // usingNoneDriver returns true if using the none driver
 func usingNoneDriver(r util.MinikubeRunner) bool {
 	return strings.Contains(r.StartArgs, "--vm-driver=none")