Merge pull request #39889 from Random-Liu/add-docker-1.12-node-e2e

Automatic merge from submit-queue (batch tested with PRs 38427, 39896, 39889, 39871, 39895) Add docker 1.12 in node e2e. Add docker 1.12 image in node e2e (including regular node e2e and cri node e2e). @dchen1107 @yujuhong /cc @kubernetes/sig-node-misc

Merge pull request #39889 from Random-Liu/add-docker-1.12-node-e2e
4744e7ec · Kubernetes Submit Queue · GitHub · df4e8053 · 04e68619 · 4744e7ec
Commit 4744e7ec authored Jan 13, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 13, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 4 deletions

image-config.yaml test/e2e_node/jenkins/cri_validation/image-config.yaml +3 -0

image-config.yaml test/e2e_node/jenkins/image-config.yaml +7 -4

No files found.
--- a/test/e2e_node/jenkins/cri_validation/image-config.yaml
+++ b/test/e2e_node/jenkins/cri_validation/image-config.yaml
@@ -6,3 +6,6 @@ images:
    image_regex: gci-dev-56-8977-0-0
    project: google-containers
    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
+  ubuntu-docker12:
+    image: e2e-node-ubuntu-trusty-docker12-v1-image
+    project: kubernetes-node-e2e-images
--- a/test/e2e_node/jenkins/image-config.yaml
+++ b/test/e2e_node/jenkins/image-config.yaml
@@ -3,16 +3,19 @@
 # `gcloud compute --project <to-project> images create <image-name> --source-disk=<image-name>`
 images:
  ubuntu-docker10:
-    image: e2e-node-ubuntu-trusty-docker10-v2-image
+    image: e2e-node-ubuntu-trusty-docker10-v2-image # docker 1.10.3
+    project: kubernetes-node-e2e-images
+  ubuntu-docker12:
+    image: e2e-node-ubuntu-trusty-docker12-v1-image # docker 1.12.4
    project: kubernetes-node-e2e-images
  coreos-alpha:
-    image: coreos-alpha-1122-0-0-v20160727
+    image: coreos-alpha-1122-0-0-v20160727 # docker 1.11.2
    project: coreos-cloud
    metadata: "user-data<test/e2e_node/jenkins/coreos-init.json"
  containervm:
-    image: e2e-node-containervm-v20161208-image
+    image: e2e-node-containervm-v20161208-image # docker 1.11.2
    project: kubernetes-node-e2e-images
  gci-family:
-    image_regex: gci-dev-56-8977-0-0
+    image_regex: gci-dev-56-8977-0-0 # docker 1.11.2
    project: google-containers
    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"