Merge pull request kubernetes#28927 from Random-Liu/docker-validation…

…-image-config-file Automatic merge from submit-queue Change the docker validation node e2e test to use gci-canary-test This PR changed the continuous docker validation node e2e test to use the image config file introduced in kubernetes#28708. @euank This PR also changed the gci image family from `gci-preview-test` to `gci-canary-test`. @wonderfly
lavalamp · Jul 19, 2016 · b3797b8 · b3797b8
2 parents 3786701 + b0d3f4c
commit b3797b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/test/e2e_node/jenkins/e2e-node-jenkins.sh b/test/e2e_node/jenkins/e2e-node-jenkins.sh
@@ -37,6 +37,7 @@ ARTIFACTS=${WORKSPACE}/_artifacts
 mkdir -p ${ARTIFACTS}
 go run test/e2e_node/runner/run_e2e.go  --logtostderr --vmodule=*=2 --ssh-env="gce" \
   --zone="$GCE_ZONE" --project="$GCE_PROJECT" --hosts="$GCE_HOSTS" \
+  --images="$GCE_IMAGES" --image-project="$GCE_IMAGE_PROJECT" \
   --image-config-file="$GCE_IMAGE_CONFIG_PATH" --cleanup="$CLEANUP" \
   --results-dir="$ARTIFACTS" --ginkgo-flags="$GINKGO_FLAGS" \
   --setup-node="$SETUP_NODE" --test_args="$TEST_ARGS" --instance-metadata="$GCE_INSTANCE_METADATA"
diff --git a/test/e2e_node/jenkins/jenkins-docker-validation.properties b/test/e2e_node/jenkins/jenkins-docker-validation.properties
@@ -1,5 +1,5 @@
 GCI_IMAGE_PROJECT=container-vm-image-staging
-GCI_IMAGE_FAMILY=gci-preview-test
+GCI_IMAGE_FAMILY=gci-canary-test
 GCI_IMAGE=$(gcloud compute images describe-from-family ${GCI_IMAGE_FAMILY} --project=${GCI_IMAGE_PROJECT} --format="value(name)")
 DOCKER_VERSION=$(curl -fsSL --retry 3 https://api.github.com/repos/docker/docker/releases | tac | tac | grep -m 1 "\"tag_name\"\:" | grep -Eo "[0-9\.rc-]+")
 GCI_CLOUD_INIT=test/e2e_node/jenkins/gci-init.yaml
@@ -9,7 +9,6 @@ GCE_IMAGES=${GCI_IMAGE}
 GCE_IMAGE_PROJECT=${GCI_IMAGE_PROJECT}
 GCE_ZONE=us-central1-f
 GCE_PROJECT=kubernetes-jenkins
-# kubernetes-jenkins
 # user-data is the GCI cloud init config file.
 # gci-docker-version specifies docker version in GCI image.
 GCE_INSTANCE_METADATA="user-data<${GCI_CLOUD_INIT},gci-docker-version=${DOCKER_VERSION}"