diff --git a/script/test/cri-integration.sh b/script/test/cri-integration.sh index d7abb368e..cf96b1798 100755 --- a/script/test/cri-integration.sh +++ b/script/test/cri-integration.sh @@ -46,8 +46,6 @@ ${sudo} bin/cri-integration.test --test.run="${FOCUS}" --test.v \ --containerd-bin="${CONTAINERD_BIN}" \ --image-list="${TEST_IMAGE_LIST:-}" && test_exit_code=$? || test_exit_code=$? -test_teardown - test $test_exit_code -ne 0 && \ cat "$REPORT_DIR/containerd.log" diff --git a/script/test/utils.sh b/script/test/utils.sh index 677d8d635..ce6c3bd00 100755 --- a/script/test/utils.sh +++ b/script/test/utils.sh @@ -131,7 +131,12 @@ test_teardown() { nssm stop containerd-test nssm remove containerd-test confirm else - ${sudo} pkill -g $(ps -o pgid= -p "${pid}") + pgid=$(ps -o pgid= -p "${pid}" || true) + if [ ! -z "${pgid}" ]; then + ${sudo} pkill -g ${pgid} + else + echo "pid(${pid}) not found, skipping pkill" + fi fi fi }