Mesa (master): ci: Improve baremetal's logging of the job env var passthrough.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri May 22 17:04:34 UTC 2020
Module: Mesa
Branch: master
Commit: 38f32372aa94519f86f3358bea1e26e11398d59c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=38f32372aa94519f86f3358bea1e26e11398d59c
Author: Eric Anholt <eric at anholt.net>
Date: Fri May 15 16:27:01 2020 -0700
ci: Improve baremetal's logging of the job env var passthrough.
Trying to read the sh -x script output was rough, just cat the file once
we're done setting it up.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5089>
---
.gitlab-ci/bare-metal/fastboot.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.gitlab-ci/bare-metal/fastboot.sh b/.gitlab-ci/bare-metal/fastboot.sh
index 7026f8f0962..afb5278e292 100755
--- a/.gitlab-ci/bare-metal/fastboot.sh
+++ b/.gitlab-ci/bare-metal/fastboot.sh
@@ -51,6 +51,7 @@ cp -Rp $BM_ROOTFS rootfs
# Set up the init script that brings up the system.
cp $BM/init.sh rootfs/init
+set +x
# Pass through relevant env vars from the gitlab job to the baremetal init script
touch rootfs/set-job-env-vars.sh
chmod +x rootfs/set-job-env-vars.sh
@@ -78,6 +79,9 @@ for var in \
val=`echo ${!var} | sed 's|"||g'`
echo "export $var=\"${val}\"" >> rootfs/set-job-env-vars.sh
done
+echo "Variables passed through:"
+cat rootfs/set-job-env-vars.sh
+set -x
# Add the Mesa drivers we built, and make a consistent symlink to them.
mkdir -p rootfs/$CI_PROJECT_DIR
More information about the mesa-commit
mailing list