Просмотр исходного кода

hack: remove error_on_leaked_containerd_shims

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>
Akihiro Suda 3 лет назад
Родитель
Сommit
c3eefab550
2 измененных файлов с 0 добавлено и 17 удалено
  1. 0 16
      hack/make/.integration-test-helpers
  2. 0 1
      hack/make/test-integration

+ 0 - 16
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

+ 0 - 1
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