From: Ward Vandewege <ward@curii.com>
Date: Mon, 28 Sep 2020 17:55:06 +0000 (-0400)
Subject: Do not error out in the integration test cleanup function.
X-Git-Tag: 2.1.0~6
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/c0f171c6612dc5afae0c24a93673e454fcd73909

Do not error out in the integration test cleanup function.

refs #16919

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>
---

diff --git a/tools/run-integration-tests.sh b/tools/run-integration-tests.sh
index 09cb2518..140de3c8 100755
--- a/tools/run-integration-tests.sh
+++ b/tools/run-integration-tests.sh
@@ -7,6 +7,7 @@ set -e -o pipefail
 
 cleanup() {
     set -x
+    set +e +o pipefail
     kill ${arvboot_PID} ${consume_stdout_PID} ${wb2_PID} ${consume_wb2_stdout_PID}
     wait ${arvboot_PID} ${consume_stdout_PID} ${wb2_PID} ${consume_wb2_stdout_PID} || true
     if [ "${CLEANUP_ARVADOS_DIR}" -eq "1" ]; then