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

Add docker 1.12 in node e2e.

Browse Source
This commit is contained in:
Random-Liu 2017-01-13 11:42:22 -08:00
parent 4ac5f278c5
commit 04e68619ce
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e_node/jenkins/cri_validation/image-config.yaml
View File

@ -6,3 +6,6 @@ images:
image_regex: gci-dev-56-8977-0-0 image_regex: gci-dev-56-8977-0-0
project: google-containers project: google-containers
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled" 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

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

@ -3,16 +3,19 @@
# `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-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 project: kubernetes-node-e2e-images
coreos-alpha: coreos-alpha:
image: coreos-alpha-1122-0-0-v20160727 image: coreos-alpha-1122-0-0-v20160727 # docker 1.11.2
project: coreos-cloud project: coreos-cloud
metadata: "user-data<test/e2e_node/jenkins/coreos-init.json" metadata: "user-data<test/e2e_node/jenkins/coreos-init.json"
containervm: containervm:
image: e2e-node-containervm-v20161208-image image: e2e-node-containervm-v20161208-image # docker 1.11.2
project: kubernetes-node-e2e-images project: kubernetes-node-e2e-images
gci-family: 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 project: google-containers
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"