Merge pull request #35401 from Random-Liu/add-containervm-cri-test

Automatic merge from submit-queue CRI: Add cri test on containervm. As is discussed with @yujuhong, we need to validate cri on containervm. @yujuhong @feiskyer /cc @kubernetes/sig-node

Merge pull request #35401 from Random-Liu/add-containervm-cri-test
4f072f7a · Kubernetes Submit Queue · GitHub · 1569a8b0 · 3922dd66 · 4f072f7a
Commit 4f072f7a authored Oct 24, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 24, 2016
4 changed files
--- a/test/e2e_node/jenkins/cri_validation/image-config.yaml
+++ b/test/e2e_node/jenkins/cri_validation/image-config.yaml
+images:
+  containervm:
+    image: e2e-node-containervm-v20160604-image
+    project: kubernetes-node-e2e-images
+  gci-family:
+    image_regex: gci-dev-55-8872-18-0
+    project: google-containers
+    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
--- a/test/e2e_node/jenkins/cri_validation/jenkins-pull.properties
+++ b/test/e2e_node/jenkins/cri_validation/jenkins-pull.properties
-GCI_CLOUD_INIT=test/e2e_node/jenkins/gci-init.yaml
 GCE_HOSTS=
-GCE_IMAGES=gci-dev-55-8872-18-0
-GCE_IMAGE_PROJECT=google-containers
+GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/cri_validation/image-config.yaml
 GCE_ZONE=us-central1-f
 GCE_PROJECT=k8s-jkns-pr-node-e2e
-GCE_INSTANCE_METADATA="user-data<${GCI_CLOUD_INIT}"
 CLEANUP=true
 GINKGO_FLAGS='--skip="\[Flaky\]|\[Slow\]|\[Serial\]" --flakeAttempts=2'
 SETUP_NODE=false

--- a/test/e2e_node/jenkins/cri_validation/jenkins-serial.properties
+++ b/test/e2e_node/jenkins/cri_validation/jenkins-serial.properties
-GCI_CLOUD_INIT=test/e2e_node/jenkins/gci-init.yaml
 GCE_HOSTS=
-GCE_IMAGES=gci-dev-55-8872-18-0
-GCE_IMAGE_PROJECT=google-containers
+GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/cri_validation/image-config.yaml
 GCE_ZONE=us-central1-f
 GCE_PROJECT=k8s-jkns-ci-node-e2e
-GCE_INSTANCE_METADATA="user-data<${GCI_CLOUD_INIT}"
 CLEANUP=true
 GINKGO_FLAGS='--focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]"'
 SETUP_NODE=false

--- a/test/e2e_node/jenkins/cri_validation/jenkins-validation.properties
+++ b/test/e2e_node/jenkins/cri_validation/jenkins-validation.properties
-GCI_CLOUD_INIT=test/e2e_node/jenkins/gci-init.yaml
 GCE_HOSTS=
-GCE_IMAGES=gci-dev-55-8872-18-0
-GCE_IMAGE_PROJECT=google-containers
+GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/cri_validation/image-config.yaml
 GCE_ZONE=us-central1-f
 GCE_PROJECT=k8s-jkns-ci-node-e2e
-GCE_INSTANCE_METADATA="user-data<${GCI_CLOUD_INIT}"
 CLEANUP=true
 GINKGO_FLAGS='--skip="\[Flaky\]|\[Serial\]"'
 SETUP_NODE=false