From 3922dd666725a5420c85a71561790096e9226f5f Mon Sep 17 00:00:00 2001
From: Random-Liu <taotaotheripper@gmail.com>
Date: Sun, 23 Oct 2016 19:35:49 -0700
Subject: [PATCH] Add cri test on containervm.

---
 test/e2e_node/jenkins/cri_validation/image-config.yaml    | 8 ++++++++
 .../jenkins/cri_validation/jenkins-pull.properties        | 5 +----
 .../jenkins/cri_validation/jenkins-serial.properties      | 5 +----
 .../jenkins/cri_validation/jenkins-validation.properties  | 5 +----
 4 files changed, 11 insertions(+), 12 deletions(-)
 create mode 100644 test/e2e_node/jenkins/cri_validation/image-config.yaml

diff --git a/test/e2e_node/jenkins/cri_validation/image-config.yaml b/test/e2e_node/jenkins/cri_validation/image-config.yaml
new file mode 100644
index 00000000000..1997f0360e2
--- /dev/null
+++ b/test/e2e_node/jenkins/cri_validation/image-config.yaml
@@ -0,0 +1,8 @@
+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"
diff --git a/test/e2e_node/jenkins/cri_validation/jenkins-pull.properties b/test/e2e_node/jenkins/cri_validation/jenkins-pull.properties
index 438afa09955..c2f70ed4ed8 100644
--- a/test/e2e_node/jenkins/cri_validation/jenkins-pull.properties
+++ b/test/e2e_node/jenkins/cri_validation/jenkins-pull.properties
@@ -1,10 +1,7 @@
-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
diff --git a/test/e2e_node/jenkins/cri_validation/jenkins-serial.properties b/test/e2e_node/jenkins/cri_validation/jenkins-serial.properties
index e97ab7860bd..e3e67f35ed7 100644
--- a/test/e2e_node/jenkins/cri_validation/jenkins-serial.properties
+++ b/test/e2e_node/jenkins/cri_validation/jenkins-serial.properties
@@ -1,10 +1,7 @@
-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
diff --git a/test/e2e_node/jenkins/cri_validation/jenkins-validation.properties b/test/e2e_node/jenkins/cri_validation/jenkins-validation.properties
index c58cf725cac..318d4219179 100644
--- a/test/e2e_node/jenkins/cri_validation/jenkins-validation.properties
+++ b/test/e2e_node/jenkins/cri_validation/jenkins-validation.properties
@@ -1,10 +1,7 @@
-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