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

Merge pull request #40884 from Random-Liu/update-to-docker-1-12-6

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 40884, 40809, 40845, 40866, 40875)

Node E2E: Create new ubuntu image with docker 1.12.6.

We should test the newest docker 1.12 version - 1.12.6.

/cc @dchen1107 @yujuhong @kubernetes/sig-node-pr-reviews
This commit is contained in:
Kubernetes Submit Queue 2017-02-02 18:53:47 -08:00 committed by GitHub
commit 7201f3b989
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,5 +7,5 @@ images:
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
image: e2e-node-ubuntu-trusty-docker12-v2-image
project: kubernetes-node-e2e-images

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

@ -6,7 +6,7 @@ images:
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
image: e2e-node-ubuntu-trusty-docker12-v2-image # docker 1.12.6
project: kubernetes-node-e2e-images
coreos-alpha:
image: coreos-alpha-1122-0-0-v20160727 # docker 1.11.2