Merge pull request #23631 from mlaventure/unstuck-ci-hangs-with-warning
Prevent CI from getting stuck if shims are left alive
This commit is contained in:
commit
3926d98394
|
@ -15,4 +15,17 @@ bundle_test_integration_cli() {
|
||||||
bundle_test_integration_cli
|
bundle_test_integration_cli
|
||||||
|
|
||||||
bundle .integration-daemon-stop
|
bundle .integration-daemon-stop
|
||||||
|
|
||||||
|
if [ "$(go env GOOS)" != 'windows' ]
|
||||||
|
then
|
||||||
|
leftovers=$(ps -ax -o pid,cmd | awk '$2 == "docker-containerd-shim" && $4 ~ /.*\/bundles\/.*\/test-integration-cli/ { print $1 }')
|
||||||
|
if [ -n "$leftovers" ]
|
||||||
|
then
|
||||||
|
ps aux
|
||||||
|
kill -9 $leftovers 2> /dev/null
|
||||||
|
echo "!!!! WARNING you have left over shim(s), Cleanup your test !!!!"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
) 2>&1 | tee -a "$DEST/test.log"
|
) 2>&1 | tee -a "$DEST/test.log"
|
||||||
|
|
Loading…
Reference in New Issue