github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Kubernetes Submit Queue 2016-11-22 11:59:54 -08:00 committed by GitHub
commit d0ae65a4a5
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e_node/environment/setup_host.sh
View File

@ -89,6 +89,7 @@ if [ $? -ne 0 ]; then
fi fi
# Allow jenkins access to docker # Allow jenkins access to docker
id jenkins || sudo useradd jenkins -m
sudo usermod -a -G docker jenkins sudo usermod -a -G docker jenkins
# install lxc # install lxc

5
test/e2e_node/jenkins/image-config.yaml
View File

@ -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> 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>` # `gcloud compute --project <to-project> images create <image-name> --source-disk=<image-name>`
images: images:
ubuntu-docker9:
image: e2e-node-ubuntu-trusty-docker9-v1-image
project: kubernetes-node-e2e-images
ubuntu-docker10: ubuntu-docker10:
image: e2e-node-ubuntu-trusty-docker10-v1-image image: e2e-node-ubuntu-trusty-docker10-v2-image
project: kubernetes-node-e2e-images project: kubernetes-node-e2e-images
coreos-alpha: coreos-alpha:
image: coreos-alpha-1122-0-0-v20160727 image: coreos-alpha-1122-0-0-v20160727