From 7176e0c1602d74df30ff070035c536e151be9605 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Mon, 6 Mar 2023 16:16:12 +0000 Subject: [PATCH] ci: group RESULT logic in a single place Part-of: --- .gitlab-ci/common/init-stage2.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci/common/init-stage2.sh b/.gitlab-ci/common/init-stage2.sh index 0b27b81017c..22a8874c293 100755 --- a/.gitlab-ci/common/init-stage2.sh +++ b/.gitlab-ci/common/init-stage2.sh @@ -169,7 +169,6 @@ if [ -n "$HWCI_START_WESTON" ]; then while [ ! -S "$WESTON_X11_SOCK" ]; do sleep 1; done fi -RESULT=fail set +e bash -c ". $SCRIPTS_DIR/setup-test-env.sh && $HWCI_TEST_SCRIPT" EXIT_CODE=$? @@ -193,7 +192,7 @@ fi # We still need to echo the hwci: mesa message, as some scripts rely on it, such # as the python ones inside the bare-metal folder -[ ${EXIT_CODE} -eq 0 ] && RESULT=pass +[ ${EXIT_CODE} -eq 0 ] && RESULT=pass || RESULT=fail set +x echo "hwci: mesa: $RESULT"