aboutsummaryrefslogtreecommitdiffstats
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2020-06-08 15:23:52 -0700
committerMarge Bot <[email protected]>2020-06-12 23:34:44 +0000
commit445f3eb0ead3cf49f320521ec20c05160f2d60c0 (patch)
tree2402aa32deb1e1edb8c768e392c8746c5ea3793b /.gitlab-ci
parenta13209bdec8ca5ebd0dcc4b7b33d1fe58028fcb8 (diff)
ci/bare-metal: Make which test to run configurable.
I'll use this to run tracie in a new job I'm working on. Reviewed-by: Christian Gmeiner <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5393>
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/bare-metal/init.sh2
-rw-r--r--.gitlab-ci/bare-metal/rootfs-setup.sh1
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci/bare-metal/init.sh b/.gitlab-ci/bare-metal/init.sh
index 93de85c9f28..3be84268003 100644
--- a/.gitlab-ci/bare-metal/init.sh
+++ b/.gitlab-ci/bare-metal/init.sh
@@ -17,7 +17,7 @@ if [ -e /install/deqp-expected-fails.txt ]; then
export DEQP_EXPECTED_FAILS=deqp-expected-fails.txt
fi
-if sh /deqp/deqp-runner.sh; then
+if sh $BARE_METAL_TEST_SCRIPT; then
echo "bare-metal result: pass"
else
echo "bare-metal result: fail"
diff --git a/.gitlab-ci/bare-metal/rootfs-setup.sh b/.gitlab-ci/bare-metal/rootfs-setup.sh
index 0181a4e8fac..ba4d23148c2 100644
--- a/.gitlab-ci/bare-metal/rootfs-setup.sh
+++ b/.gitlab-ci/bare-metal/rootfs-setup.sh
@@ -12,6 +12,7 @@ set +x
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_ID \