From 9f3173701a758c78efdaa3d094e198c4b74ba1c6 Mon Sep 17 00:00:00 2001 From: Anil Kedia Date: Mon, 27 Jun 2022 20:09:24 +0000 Subject: [PATCH] Forward port the fix for Owls 100113 (PR 3207) to main. --- operator/integration-tests/model-in-image/run-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operator/integration-tests/model-in-image/run-test.sh b/operator/integration-tests/model-in-image/run-test.sh index d42a91abd99..a24dd17b595 100755 --- a/operator/integration-tests/model-in-image/run-test.sh +++ b/operator/integration-tests/model-in-image/run-test.sh @@ -12,7 +12,7 @@ set -eu set -o pipefail -trap '[ -z "$(jobs -pr)" ] || kill $(jobs -pr)' SIGINT SIGTERM EXIT +trap 'status=$? ; set +eu ; set +o pipefail ; kill $(jobs -pr) > /dev/null 2>&1 ; exit $status' SIGINT SIGTERM EXIT TESTDIR="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"