aboutsummaryrefslogtreecommitdiffstats
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2020-05-15 16:27:01 -0700
committerMarge Bot <[email protected]>2020-05-22 16:44:46 +0000
commit38f32372aa94519f86f3358bea1e26e11398d59c (patch)
treeadfa7e6a11ee397ad2185dba5ea271e36e909abb /.gitlab-ci
parentae442c35982e1052267affd92a68f875159a2d08 (diff)
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>
Diffstat (limited to '.gitlab-ci')
-rwxr-xr-x.gitlab-ci/bare-metal/fastboot.sh4
1 files changed, 4 insertions, 0 deletions
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