github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #39889 from Random-Liu/add-docker-1.12-node-e2e

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 38427, 39896, 39889, 39871, 39895)

Add docker 1.12 in node e2e.

Add docker 1.12 image in node e2e (including regular node e2e and cri node e2e).

@dchen1107 @yujuhong 
/cc @kubernetes/sig-node-misc
This commit is contained in:
Kubernetes Submit Queue 2017-01-13 20:21:38 -08:00 committed by GitHub
commit 4744e7ec52
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
project: google-containers
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>`
images:
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
coreos-alpha:
image: coreos-alpha-1122-0-0-v20160727
image: coreos-alpha-1122-0-0-v20160727 # docker 1.11.2
project: coreos-cloud
metadata: "user-data<test/e2e_node/jenkins/coreos-init.json"
containervm:
image: e2e-node-containervm-v20161208-image
image: e2e-node-containervm-v20161208-image # docker 1.11.2
project: kubernetes-node-e2e-images
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
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"