b5d36e9cb6
Eric Anholt identified the issue when merging one of my MRs: the variable contained words in '`' backticks, which caused them to be executed by the bare metal runner's shell. Quote the value printed using bash's shell expansion feature to make sure anything in the future will be properly quoted. Signed-off-by: Eric Engestrom <eric@engestrom.ch> Reviewed-by: Eric Anholt <eric@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6389>
64 lines
1.6 KiB
Bash
64 lines
1.6 KiB
Bash
#!/bin/bash
|
|
|
|
rootfs_dst=$1
|
|
|
|
mkdir -p $rootfs_dst/results
|
|
|
|
# Set up the init script that brings up the system.
|
|
cp $BM/init.sh $rootfs_dst/init
|
|
|
|
cp $BM/capture-devcoredump.sh $rootfs_dst/
|
|
|
|
set +x
|
|
# Pass through relevant env vars from the gitlab job to the baremetal init script
|
|
touch $rootfs_dst/set-job-env-vars.sh
|
|
chmod +x $rootfs_dst/set-job-env-vars.sh
|
|
for var in \
|
|
BARE_METAL_TEST_SCRIPT \
|
|
CI_COMMIT_BRANCH \
|
|
CI_COMMIT_TITLE \
|
|
CI_JOB_JWT \
|
|
CI_JOB_ID \
|
|
CI_JOB_URL \
|
|
CI_MERGE_REQUEST_SOURCE_BRANCH_NAME \
|
|
CI_MERGE_REQUEST_TITLE \
|
|
CI_NODE_INDEX \
|
|
CI_NODE_TOTAL \
|
|
CI_PIPELINE_ID \
|
|
CI_PROJECT_PATH \
|
|
CI_RUNNER_DESCRIPTION \
|
|
DEQP_CASELIST_FILTER \
|
|
DEQP_EXPECTED_FAILS \
|
|
DEQP_EXPECTED_RENDERER \
|
|
DEQP_NO_SAVE_RESULTS \
|
|
DEQP_PARALLEL \
|
|
DEQP_RUN_SUFFIX \
|
|
DEQP_SKIPS \
|
|
DEQP_VER \
|
|
DEVICE_NAME \
|
|
DRIVER_NAME \
|
|
FD_MESA_DEBUG \
|
|
FLAKES_CHANNEL \
|
|
IR3_SHADER_DEBUG \
|
|
MESA_GL_VERSION_OVERRIDE \
|
|
MESA_GLSL_VERSION_OVERRIDE \
|
|
MESA_GLES_VERSION_OVERRIDE \
|
|
NIR_VALIDATE \
|
|
TRACIE_NO_UNIT_TESTS \
|
|
TRACIE_UPLOAD_TO_MINIO \
|
|
TU_DEBUG \
|
|
VK_DRIVER \
|
|
; do
|
|
if [ -n "${!var+x}" ]; then
|
|
echo "export $var=${!var@Q}" >> $rootfs_dst/set-job-env-vars.sh
|
|
fi
|
|
done
|
|
echo "Variables passed through:"
|
|
cat $rootfs_dst/set-job-env-vars.sh
|
|
set -x
|
|
|
|
# Add the Mesa drivers we built, and make a consistent symlink to them.
|
|
mkdir -p $rootfs_dst/$CI_PROJECT_DIR
|
|
tar -C $rootfs_dst/$CI_PROJECT_DIR/ -xf $CI_PROJECT_DIR/artifacts/install.tar
|
|
ln -sf $CI_PROJECT_DIR/install $rootfs_dst/install
|