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 #51158 from yguo0905/overlay2

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 51224, 51191, 51158, 50669, 51222)

Enable overlay2 on cos-m60 in node e2e tests

Ref: https://github.com/kubernetes/kubernetes/issues/42926

- Restart docker with `-s overlay2` in cloud-init before running all node e2e tests. I have to copy the systemd unit file to `/etc/systemd/system` because the `/usr/lib/systemd/system/` is read only.
- Updated node e2e tests to use the new cos-m60 image.
- The name of the cloud init file (`cos-init-live-restore.yaml`) does not indicate overlay2 will be enabled, but I can't just change the name in this PR, since it's referenced in test-infra.

**Release note**:

```
None
```

/assign @Random-Liu
This commit is contained in:
Kubernetes Submit Queue 2017-08-24 22:59:33 -07:00 committed by GitHub
commit 4a94363c7e
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e_node/jenkins/cos-init-live-restore.yaml
View File

@ -1,6 +1,9 @@
#cloud-config #cloud-config
runcmd: runcmd:
- cp /usr/lib/systemd/system/docker.service /etc/systemd/system/
- sed -i -e 's/-s overlay/-s overlay2/g' /etc/systemd/system/docker.service
- systemctl daemon-reload
- echo '{"live-restore":true}' > /etc/docker/daemon.json - echo '{"live-restore":true}' > /etc/docker/daemon.json
- systemctl restart docker - systemctl restart docker
- mount /tmp /tmp -o remount,exec,suid - mount /tmp /tmp -o remount,exec,suid

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

@ -12,7 +12,7 @@ images:
containervm: containervm:
image: e2e-node-containervm-v20161208-image # docker 1.11.2 image: e2e-node-containervm-v20161208-image # docker 1.11.2
project: kubernetes-node-e2e-images project: kubernetes-node-e2e-images
cos-stable: cos-stable2:
image_regex: cos-stable-59-9460-64-0 # docker 1.11.2 image_regex: cos-stable-59-9460-64-0 # docker 1.11.2
project: cos-cloud project: cos-cloud
metadata: "user-data<test/e2e_node/jenkins/gci-init-gpu.yaml,gci-update-strategy=update_disabled" metadata: "user-data<test/e2e_node/jenkins/gci-init-gpu.yaml,gci-update-strategy=update_disabled"
@ -20,7 +20,7 @@ images:
accelerators: accelerators:
- type: nvidia-tesla-k80 - type: nvidia-tesla-k80
count: 2 count: 2
cos-beta: cos-stable1:
image_regex: cos-beta-60-9592-70-0 # docker 1.13.1 image_regex: cos-stable-60-9592-84-0 # docker 1.13.1
project: cos-cloud project: cos-cloud
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled" metadata: "user-data<test/e2e_node/jenkins/cos-init-live-restore.yaml,gci-update-strategy=update_disabled"

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

@ -12,11 +12,11 @@ images:
containervm: containervm:
image: e2e-node-containervm-v20161208-image # docker 1.11.2 image: e2e-node-containervm-v20161208-image # docker 1.11.2
project: kubernetes-node-e2e-images project: kubernetes-node-e2e-images
cos-stable: cos-stable2:
image_regex: cos-stable-59-9460-64-0 # docker 1.11.2 image_regex: cos-stable-59-9460-64-0 # docker 1.11.2
project: cos-cloud project: cos-cloud
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"
cos-beta: cos-stable1:
image_regex: cos-beta-60-9592-70-0 # docker 1.13.1 image_regex: cos-stable-60-9592-84-0 # docker 1.13.1
project: cos-cloud project: cos-cloud
metadata: "user-data<test/e2e_node/jenkins/cos-init-live-restore.yaml,gci-update-strategy=update_disabled" metadata: "user-data<test/e2e_node/jenkins/cos-init-live-restore.yaml,gci-update-strategy=update_disabled"