diff options
| author | Eric Engestrom <eric@igalia.com> | 2023-05-10 12:54:58 +0100 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-05-12 16:36:57 +0000 |
| commit | ef831c137fcf46d9df6a180a33fdb16fa2da3707 (patch) | |
| tree | 2582fb9e8777cd18ea2b17cc56bdd6d7208cb281 /.gitlab-ci | |
| parent | 07a8fdb9bb5889941afdcb7a589c7b1d80d32be7 (diff) | |
| download | mesa-ef831c137fcf46d9df6a180a33fdb16fa2da3707.tar.gz | |
ci: replace write + cat with tee
Signed-off-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Emma Anholt <emma@anholt.net>
Reviewed-by: Martin Roukala <martin.roukala@mupuf.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22945>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/bare-metal/rootfs-setup.sh | 3 | ||||
| -rwxr-xr-x | .gitlab-ci/lava/lava-submit.sh | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/.gitlab-ci/bare-metal/rootfs-setup.sh b/.gitlab-ci/bare-metal/rootfs-setup.sh index 6bd5adb39ca..23226e4751b 100644 --- a/.gitlab-ci/bare-metal/rootfs-setup.sh +++ b/.gitlab-ci/bare-metal/rootfs-setup.sh @@ -23,9 +23,8 @@ cp "$SCRIPTS_DIR/setup-test-env.sh" "$rootfs_dst/" set +x # Pass through relevant env vars from the gitlab job to the baremetal init script -"$CI_COMMON"/generate-env.sh > $rootfs_dst/set-job-env-vars.sh echo "Variables passed through:" -cat $rootfs_dst/set-job-env-vars.sh +"$CI_COMMON"/generate-env.sh | tee $rootfs_dst/set-job-env-vars.sh set -x diff --git a/.gitlab-ci/lava/lava-submit.sh b/.gitlab-ci/lava/lava-submit.sh index 5f5870585aa..f2b4fc5a0d7 100755 --- a/.gitlab-ci/lava/lava-submit.sh +++ b/.gitlab-ci/lava/lava-submit.sh @@ -24,10 +24,9 @@ cp artifacts/ci-common/intel-gpu-freq.sh results/job-rootfs-overlay/ cp "$SCRIPTS_DIR"/setup-test-env.sh results/job-rootfs-overlay/ # Prepare env vars for upload. -KERNEL_IMAGE_BASE_URL="https://${BASE_SYSTEM_HOST_PATH}" \ - artifacts/ci-common/generate-env.sh > results/job-rootfs-overlay/set-job-env-vars.sh section_start variables "Variables passed through:" -cat results/job-rootfs-overlay/set-job-env-vars.sh +KERNEL_IMAGE_BASE_URL="https://${BASE_SYSTEM_HOST_PATH}" \ + artifacts/ci-common/generate-env.sh | tee results/job-rootfs-overlay/set-job-env-vars.sh section_end variables tar zcf job-rootfs-overlay.tar.gz -C results/job-rootfs-overlay/ . |