Skip to content

Commit b1f622e

Browse files
authored
Merge pull request #35088 from bart0sh/PR079-debug-setup-cdi-in-pull-kubernetes-dra-integration-canary
DRA: debug: forcibly stop docker
2 parents 6f88470 + 8010067 commit b1f622e

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

config/jobs/kubernetes/sig-node/dra-canary.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,9 @@ presubmits:
499499
- /bin/bash
500500
- -xce
501501
- |
502-
service docker stop
502+
timeout 30 service docker stop || true
503+
# force kill docker related processes
504+
(cat /var/run/docker*.pid | xargs kill -9) || true
503505
rm /var/log/docker.log
504506
containerd config default > /etc/containerd/config.toml
505507
sed -ie 's/enable_cdi = false/enable_cdi = true/' /etc/containerd/config.toml

config/jobs/kubernetes/sig-node/dra.jinja

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ presubmits:
117117
- /bin/bash
118118
- -xce
119119
- |
120-
service docker stop
120+
timeout 30 service docker stop || true
121+
# force kill docker related processes
122+
(cat /var/run/docker*.pid | xargs kill -9) || true
121123
rm /var/log/docker.log
122124
containerd config default > /etc/containerd/config.toml
123125
sed -ie 's/enable_cdi = false/enable_cdi = true/' /etc/containerd/config.toml

0 commit comments

Comments
 (0)