kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

hack: remove error_on_leaked_containerd_shims

Browse source 
The function does not support containerd-shim-runc-v2 (io.containerd.runc.v2)

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2022-06-05 18:21:50 +09:00
parent 1fcd9f73d4
commit c3eefab550
No known key found for this signature in database
GPG key ID: 49524C6F9F638F1A
2 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
hack/make/.integration-test-helpers
View file

@ -161,22 +161,6 @@ test_env() {
) )
} }
error_on_leaked_containerd_shims() {
if [ "$(go env GOOS)" = 'windows' ]; then
return
fi
leftovers=$(ps -ax -o pid,cmd \
| awk '$2 == "containerd-shim" && $4 ~ /.*\/bundles\/.*\/test-integration/ { print $1 }')
if [ -n "$leftovers" ]; then
ps aux
# shellcheck disable=SC2086
kill -9 ${leftovers} 2> /dev/null
echo "!!!! WARNING you have left over shim(s), Cleanup your test !!!!"
exit 1
fi
}
set_platform_timeout() { set_platform_timeout() {
# Test timeout. # Test timeout.
if [ "${DOCKER_ENGINE_GOARCH}" = "arm64" ] || [ "${DOCKER_ENGINE_GOARCH}" = "arm" ]; then if [ "${DOCKER_ENGINE_GOARCH}" = "arm64" ] || [ "${DOCKER_ENGINE_GOARCH}" = "arm" ]; then

1
hack/make/test-integration
View file

@ -20,7 +20,6 @@ fi
# Always run cleanup, even if the subshell fails # Always run cleanup, even if the subshell fails
bundle .integration-daemon-stop bundle .integration-daemon-stop
cleanup_test_suite_binaries cleanup_test_suite_binaries
error_on_leaked_containerd_shims
echo exiting test-integration echo exiting test-integration
set -x set -x