summaryrefslogtreecommitdiffstats
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2020-05-15 16:27:01 -0700
committerEric Engestrom <[email protected]>2020-07-08 19:31:15 +0200
commit114871dcc8b7f26ef225a8c53a0e4899425da565 (patch)
treed4aee9e88cc20d305505c2ceaa3427c24fee2a25 /.gitlab-ci
parentece1b1ca0c649bfc1871668d5cf85d67b3c306a0 (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. (cherry picked from commit 38f32372aa94519f86f3358bea1e26e11398d59c) Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5548>
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 7b9e6162a07..9c9c67dcc6e 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
@@ -73,6 +74,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