diff options
| author | Eric Anholt <[email protected]> | 2020-05-04 13:42:41 -0700 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-05-06 18:34:38 +0000 |
| commit | c7bbc211d681696687a134eb158d55fcb674907c (patch) | |
| tree | a323a23b879dc4b9aea3d4cd145a7a7f3812fe58 /.gitlab-ci/bare-metal/fastboot.sh | |
| parent | 29da52128090a1ef8ef782188c0f67c7f5ec8d19 (diff) | |
ci: Clean up setup of the job-specific env vars in baremetal testing.
Avoids copy and paste errors when adding more vars.
Reviewed-by: Rob Clark <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4896>
Diffstat (limited to '.gitlab-ci/bare-metal/fastboot.sh')
| -rwxr-xr-x | .gitlab-ci/bare-metal/fastboot.sh | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/.gitlab-ci/bare-metal/fastboot.sh b/.gitlab-ci/bare-metal/fastboot.sh index 5e57639c476..5d2d1de176c 100755 --- a/.gitlab-ci/bare-metal/fastboot.sh +++ b/.gitlab-ci/bare-metal/fastboot.sh @@ -50,11 +50,20 @@ cp -Rp $BM_ROOTFS rootfs # Set up the init script that brings up the system. cp $BM/init.sh rootfs/init -sed -i "s|DEQP_VER_REPLACE|$DEQP_VER|g" rootfs/init -sed -i "s|DEQP_PARALLEL_REPLACE|$DEQP_PARALLEL|g" rootfs/init -sed -i "s|DEQP_EXPECTED_RENDERER_REPLACE|$DEQP_EXPECTED_RENDERER|g" rootfs/init -sed -i "s|CI_NODE_INDEX_REPLACE|$CI_NODE_INDEX|g" rootfs/init -sed -i "s|CI_NODE_TOTAL_REPLACE|$CI_NODE_TOTAL|g" rootfs/init + +# 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 +for var in \ + CI_NODE_INDEX \ + CI_NODE_TOTAL \ + DEQP_EXPECTED_RENDERER \ + DEQP_PARALLEL \ + DEQP_VER \ + ; do + val=`echo ${!var} | sed 's|"||g'` + echo "export $var=\"${val}\"" >> rootfs/set-job-env-vars.sh +done # Add the Mesa drivers we built, and make a consistent symlink to them. mkdir -p rootfs/$CI_PROJECT_DIR |