From df402eb83e23dbc71600fb073694de985fc22ab9 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Fri, 11 Jun 2021 00:13:30 +0100 Subject: [PATCH] ci/lava: Avoid tee as it ruins exit status I was today years old when I learned this about classic composable UNIX tools: ~/mesa/mesa lava-submitter-overlay * % bash [daniels@strictly mesa]$ set -e [daniels@strictly mesa]$ false | tee [daniels@strictly mesa]$ echo $? 0 Use tail rather than tee, so it doesn't hide our exit status. Signed-off-by: Daniel Stone Part-of: --- .gitlab-ci/lava/lava-submit.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/lava/lava-submit.sh b/.gitlab-ci/lava/lava-submit.sh index f5fb1142284..d7de193e223 100755 --- a/.gitlab-ci/lava/lava-submit.sh +++ b/.gitlab-ci/lava/lava-submit.sh @@ -19,6 +19,8 @@ tar zcf job-rootfs-overlay.tar.gz -C results/job-rootfs-overlay/ . ci-fairy minio login "${CI_JOB_JWT}" ci-fairy minio cp job-rootfs-overlay.tar.gz "minio://${JOB_ROOTFS_OVERLAY_PATH}" +touch results/lava.log +tail -f results/lava.log & artifacts/lava/lava_job_submitter.py \ --dump-yaml \ --template artifacts/lava/lava.yml.jinja2 \ @@ -32,4 +34,4 @@ artifacts/lava/lava_job_submitter.py \ --kernel-image-name ${KERNEL_IMAGE_NAME} \ --kernel-image-type "${KERNEL_IMAGE_TYPE}" \ --boot-method ${BOOT_METHOD} \ - --lava-tags "${LAVA_TAGS}" | tee results/lava.log + --lava-tags "${LAVA_TAGS}" >> results/lava.log