Merge pull request #37277 from Random-Liu/update-ubuntu-image

Automatic merge from submit-queue Node E2E: Update ubuntu image to e2e-node-ubuntu-trusty-docker10-v2-image. @sjenning Hopefully this will unblock https://github.com/kubernetes/kubernetes/pull/32577. I built a new ubuntu trusty image with docker 10 - `e2e-node-ubuntu-trusty-docker10-v2-image`. The kernel version of the new ubuntu image is `4.4.0-47-generic`. @dchen1107 /cc @kubernetes/sig-node Mark v1.5 because this unblocks a v1.5 feature https://github.com/kubernetes/kubernetes/pull/32577.

Merge pull request #37277 from Random-Liu/update-ubuntu-image
d0ae65a4 · Kubernetes Submit Queue · GitHub · ddf5888d · ab99cc0e · d0ae65a4
Commit d0ae65a4 authored Nov 22, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

setup_host.sh test/e2e_node/environment/setup_host.sh +1 -0

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

No files found.
--- a/test/e2e_node/environment/setup_host.sh
+++ b/test/e2e_node/environment/setup_host.sh
@@ -89,6 +89,7 @@ if [ $? -ne 0 ]; then
 fi
 # Allow jenkins access to docker
+id jenkins || sudo useradd jenkins -m
 sudo usermod -a -G docker jenkins
 # install lxc

--- a/test/e2e_node/jenkins/image-config.yaml
+++ b/test/e2e_node/jenkins/image-config.yaml
@@ -2,11 +2,8 @@
 # `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-docker9:
-    image: e2e-node-ubuntu-trusty-docker9-v1-image
-    project: kubernetes-node-e2e-images
  ubuntu-docker10:
-    image: e2e-node-ubuntu-trusty-docker10-v1-image
+    image: e2e-node-ubuntu-trusty-docker10-v2-image
    project: kubernetes-node-e2e-images
  coreos-alpha:
    image: coreos-alpha-1122-0-0-v20160727