From 404cda27777133b225f1484949a52a850187d0e4 Mon Sep 17 00:00:00 2001
From: Yang Guo <ygg@google.com>
Date: Wed, 14 Jun 2017 11:44:25 -0700
Subject: [PATCH] Changes node e2e tests to use new Ubuntu image

---
 test/e2e_node/jenkins/image-config-serial.yaml | 9 +++------
 test/e2e_node/jenkins/image-config.yaml        | 9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/test/e2e_node/jenkins/image-config-serial.yaml b/test/e2e_node/jenkins/image-config-serial.yaml
index 359bbcdb77..70e0801f38 100644
--- a/test/e2e_node/jenkins/image-config-serial.yaml
+++ b/test/e2e_node/jenkins/image-config-serial.yaml
@@ -2,12 +2,9 @@
 # `gcloud compute --project <to-project> disks create <image name> --image=https://www.googleapis.com/compute/v1/projects/<from-project>/global/images/<image-name>`
 # `gcloud compute --project <to-project> images create <image-name> --source-disk=<image-name>`
 images:
-  ubuntu-docker10:
-    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-v2-image # docker 1.12.6
-    project: kubernetes-node-e2e-images
+  ubuntu:
+    image: ubuntu-gke-1604-xenial-v20170420-1 # docker 1.12.6
+    project: ubuntu-os-gke-cloud
   coreos-alpha:
     image: coreos-alpha-1122-0-0-v20160727 # docker 1.11.2
     project: coreos-cloud
diff --git a/test/e2e_node/jenkins/image-config.yaml b/test/e2e_node/jenkins/image-config.yaml
index 735a268350..25f4fd503b 100644
--- a/test/e2e_node/jenkins/image-config.yaml
+++ b/test/e2e_node/jenkins/image-config.yaml
@@ -2,12 +2,9 @@
 # `gcloud compute --project <to-project> disks create <image name> --image=https://www.googleapis.com/compute/v1/projects/<from-project>/global/images/<image-name>`
 # `gcloud compute --project <to-project> images create <image-name> --source-disk=<image-name>`
 images:
-  ubuntu-docker10:
-    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-v2-image # docker 1.12.6
-    project: kubernetes-node-e2e-images
+  ubuntu:
+    image: ubuntu-gke-1604-xenial-v20170420-1 # docker 1.12.6
+    project: ubuntu-os-gke-cloud
   coreos-alpha:
     image: coreos-alpha-1122-0-0-v20160727 # docker 1.11.2
     project: coreos-cloud