ci/bare-metal: Use the deqp-runner bits straight out of the artifacts.
We've already uploaded and downloaded them from fd.o and put them in the
rootfs, so we can clean up the extra prep work.
Our test job now extends from .test so that the artifacts' install dir
with all the scripts is extracted. This required moving the dependency on
meson-testing to the x86 test-gl/test-vk job blocks.
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5393>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index da23aac..3f561c3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -690,8 +690,6 @@
name: "mesa_${CI_JOB_NAME}"
paths:
- results/
- dependencies:
- - meson-testing
.test-gl:
extends:
@@ -705,6 +703,8 @@
- meson-testing
- x86_test-base
- x86_test-gl
+ dependencies:
+ - meson-testing
.test-vk:
extends:
@@ -718,6 +718,8 @@
- meson-testing
- x86_test-base
- x86_test-vk
+ dependencies:
+ - meson-testing
.piglit-test:
extends:
@@ -961,6 +963,7 @@
.baremetal-test:
extends:
- .ci-run-policy
+ - .test
stage: test
artifacts:
when: always
@@ -980,7 +983,7 @@
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"
+ BARE_METAL_TEST_SCRIPT: "/install/deqp-runner.sh"
DEQP_EXPECTED_FAILS: deqp-freedreno-a307-fails.txt
DEQP_SKIPS: deqp-freedreno-a307-skips.txt
DEQP_VER: gles2