Mesa (master): ci/bare-metal: Make which test to run configurable.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Jun 12 23:50:40 UTC 2020
Module: Mesa
Branch: master
Commit: 445f3eb0ead3cf49f320521ec20c05160f2d60c0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=445f3eb0ead3cf49f320521ec20c05160f2d60c0
Author: Eric Anholt <eric at anholt.net>
Date: Mon Jun 8 15:23:52 2020 -0700
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 <christian.gmeiner at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5393>
---
.gitlab-ci.yml | 1 +
.gitlab-ci/bare-metal/init.sh | 2 +-
.gitlab-ci/bare-metal/rootfs-setup.sh | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4acc5628306..da23aac08fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -980,6 +980,7 @@ arm64_a306_gles2:
BM_ROOTFS: /lava-files/rootfs-arm64
BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8"
FLAKES_CHANNEL: "#freedreno-ci"
+ BARE_METAL_TEST_SCRIPT: "/deqp/deqp-runner.sh"
DEQP_EXPECTED_FAILS: deqp-freedreno-a307-fails.txt
DEQP_SKIPS: deqp-freedreno-a307-skips.txt
DEQP_VER: gles2
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 \
More information about the mesa-commit
mailing list