Merge pull request #595 from thockin/v4_e2e_trap_ERR

e2e: also trap ERR
This commit is contained in:
Kubernetes Prow Robot 2022-07-27 01:00:32 -07:00 committed by GitHub
commit 7cc9db160c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

View File

@ -2251,7 +2251,7 @@ make test-tools REGISTRY=e2e
function finish() { function finish() {
r=$? r=$?
trap "" INT EXIT trap "" INT EXIT ERR
if [[ $r != 0 ]]; then if [[ $r != 0 ]]; then
echo echo
echo "the directory $DIR was not removed as it contains"\ echo "the directory $DIR was not removed as it contains"\
@ -2260,7 +2260,7 @@ function finish() {
remove_containers remove_containers
exit $r exit $r
} }
trap finish INT EXIT trap finish INT EXIT ERR
echo echo
echo "test root is $DIR" echo "test root is $DIR"