diff --git a/hack/make/.integration-test-helpers b/hack/make/.integration-test-helpers index adc9c0c0a7..cd17e6354d 100644 --- a/hack/make/.integration-test-helpers +++ b/hack/make/.integration-test-helpers @@ -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() { # Test timeout. if [ "${DOCKER_ENGINE_GOARCH}" = "arm64" ] || [ "${DOCKER_ENGINE_GOARCH}" = "arm" ]; then diff --git a/hack/make/test-integration b/hack/make/test-integration index 1545cc49ee..199131c209 100755 --- a/hack/make/test-integration +++ b/hack/make/test-integration @@ -20,7 +20,6 @@ fi # Always run cleanup, even if the subshell fails bundle .integration-daemon-stop cleanup_test_suite_binaries - error_on_leaked_containerd_shims echo exiting test-integration set -x