From 04e68619cea692ebd5867b4a3e53045d44241c76 Mon Sep 17 00:00:00 2001
From: Random-Liu <taotaotheripper@gmail.com>
Date: Fri, 13 Jan 2017 11:42:22 -0800
Subject: [PATCH] Add docker 1.12 in node e2e.

---
 .../e2e_node/jenkins/cri_validation/image-config.yaml |  3 +++
 test/e2e_node/jenkins/image-config.yaml               | 11 +++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/e2e_node/jenkins/cri_validation/image-config.yaml b/test/e2e_node/jenkins/cri_validation/image-config.yaml
index 719f3675775..8f392a0556c 100644
--- 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
diff --git a/test/e2e_node/jenkins/image-config.yaml b/test/e2e_node/jenkins/image-config.yaml
index b17b075199d..2449537da7a 100644
--- 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"