Mesa (main): ci/lava: Avoid tee as it ruins exit status

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: df402eb83e23dbc71600fb073694de985fc22ab9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=df402eb83e23dbc71600fb073694de985fc22ab9

Author: Daniel Stone <daniels at collabora.com>
Date:   Fri Jun 11 00:13:30 2021 +0100

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 at strictly mesa]$ set -e
    [daniels at strictly mesa]$ false | tee
    [daniels at strictly mesa]$ echo $?
    0

Use tail rather than tee, so it doesn't hide our exit status.

Signed-off-by: Daniel Stone <daniels at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11309>

---

 .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