Merge pull request #40884 from Random-Liu/update-to-docker-1-12-6

Automatic merge from submit-queue (batch tested with PRs 40884, 40809, 40845, 40866, 40875) Node E2E: Create new ubuntu image with docker 1.12.6. We should test the newest docker 1.12 version - 1.12.6. /cc @dchen1107 @yujuhong @kubernetes/sig-node-pr-reviews

Merge pull request #40884 from Random-Liu/update-to-docker-1-12-6
7201f3b9 · Kubernetes Submit Queue · GitHub · c84f3abc · ec7f34a2 · 7201f3b9
Commit 7201f3b9 authored Feb 02, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 02, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

image-config.yaml test/e2e_node/jenkins/cri_validation/image-config.yaml +1 -1

image-config.yaml test/e2e_node/jenkins/image-config.yaml +1 -1

No files found.
--- a/test/e2e_node/jenkins/cri_validation/image-config.yaml
+++ b/test/e2e_node/jenkins/cri_validation/image-config.yaml
@@ -7,5 +7,5 @@ images:
    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
+    image: e2e-node-ubuntu-trusty-docker12-v2-image
    project: kubernetes-node-e2e-images
--- a/test/e2e_node/jenkins/image-config.yaml
+++ b/test/e2e_node/jenkins/image-config.yaml
@@ -6,7 +6,7 @@ images:
    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
+    image: e2e-node-ubuntu-trusty-docker12-v2-image # docker 1.12.6
    project: kubernetes-node-e2e-images
  coreos-alpha:
    image: coreos-alpha-1122-0-0-v20160727 # docker 1.11.2