github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 19:23:40 +00:00
Code Issues Projects Releases Wiki Activity

Changes node e2e tests to use new Ubuntu image

Browse Source
This commit is contained in:
Yang Guo 2017-06-14 11:44:25 -07:00
parent 6c38d009ce
commit 404cda2777
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e_node/jenkins/image-config-serial.yaml
View File

@ -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> 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-docker10: ubuntu:
image: e2e-node-ubuntu-trusty-docker10-v2-image # docker 1.10.3 image: ubuntu-gke-1604-xenial-v20170420-1 # docker 1.12.6
project: kubernetes-node-e2e-images project: ubuntu-os-gke-cloud
ubuntu-docker12:
image: e2e-node-ubuntu-trusty-docker12-v2-image # docker 1.12.6
project: kubernetes-node-e2e-images
coreos-alpha: coreos-alpha:
image: coreos-alpha-1122-0-0-v20160727 # docker 1.11.2 image: coreos-alpha-1122-0-0-v20160727 # docker 1.11.2
project: coreos-cloud project: coreos-cloud

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

@ -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> 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-docker10: ubuntu:
image: e2e-node-ubuntu-trusty-docker10-v2-image # docker 1.10.3 image: ubuntu-gke-1604-xenial-v20170420-1 # docker 1.12.6
project: kubernetes-node-e2e-images project: ubuntu-os-gke-cloud
ubuntu-docker12:
image: e2e-node-ubuntu-trusty-docker12-v2-image # docker 1.12.6
project: kubernetes-node-e2e-images
coreos-alpha: coreos-alpha:
image: coreos-alpha-1122-0-0-v20160727 # docker 1.11.2 image: coreos-alpha-1122-0-0-v20160727 # docker 1.11.2
project: coreos-cloud project: coreos-cloud