From 30614d1fbef6d88e8802d35a3025f5fbcbd1bf67 Mon Sep 17 00:00:00 2001 From: tstromberg Date: Fri, 25 Oct 2019 15:08:46 -0700 Subject: [PATCH] Mention GVISOR_IMAGE_VERSION --- hack/jenkins/common.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 64abce7819..79346bac5f 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -245,13 +245,13 @@ mkdir -p "${TEST_HOME}" export MINIKUBE_HOME="${TEST_HOME}/.minikube" export KUBECONFIG="${TEST_HOME}/kubeconfig" -# Build the gvisor image. This will be copied into minikube and loaded by ctr. -# Used by TestContainerd for Gvisor Test. -# TODO: move this to integration test setup. + +# Build the gvisor image so that we can integration test changes to pkg/gvisor chmod +x ./testdata/gvisor-addon # skipping gvisor mac because ofg https://github.com/kubernetes/minikube/issues/5137 if [ "$(uname)" != "Darwin" ]; then - docker build -t gcr.io/k8s-minikube/gvisor-addon:latest -f testdata/gvisor-addon-Dockerfile ./testdata + # Should match GVISOR_IMAGE_VERSION in Makefile + docker build -t gcr.io/k8s-minikube/gvisor-addon:2 -f testdata/gvisor-addon-Dockerfile ./testdata fi echo ""