github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #6106 from dmcgowan/test-cri-teardown-check-pid

Browse Source 
Check the pid in cri test teardown
This commit is contained in:
Derek McGowan 2021-10-08 14:44:44 -07:00 committed by GitHub
commit 3f033aeff3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
script/test/cri-integration.sh
View File

@ -46,8 +46,6 @@ ${sudo} bin/cri-integration.test --test.run="${FOCUS}" --test.v \
--containerd-bin="${CONTAINERD_BIN}" \ --containerd-bin="${CONTAINERD_BIN}" \
--image-list="${TEST_IMAGE_LIST:-}" && test_exit_code=$? || test_exit_code=$? --image-list="${TEST_IMAGE_LIST:-}" && test_exit_code=$? || test_exit_code=$?
test_teardown
test $test_exit_code -ne 0 && \ test $test_exit_code -ne 0 && \
cat "$REPORT_DIR/containerd.log" cat "$REPORT_DIR/containerd.log"

7
script/test/utils.sh
View File

@ -131,7 +131,12 @@ test_teardown() {
nssm stop containerd-test nssm stop containerd-test
nssm remove containerd-test confirm nssm remove containerd-test confirm
else 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
fi fi
} }