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>

.gitlab-ci.yml

@@ -690,8 +690,6 @@ meson-mingw32-x86_64:
     name: "mesa_${CI_JOB_NAME}"
     paths:
       - results/
-  dependencies:
-    - meson-testing
 
 .test-gl:
   extends:
@@ -705,6 +703,8 @@ meson-mingw32-x86_64:
     - meson-testing
     - x86_test-base
     - x86_test-gl
+  dependencies:
+    - meson-testing
 
 .test-vk:
   extends:
@@ -718,6 +718,8 @@ meson-mingw32-x86_64:
     - meson-testing
     - x86_test-base
     - x86_test-vk
+  dependencies:
+    - meson-testing
 
 .piglit-test:
   extends:
@@ -961,6 +963,7 @@ arm64_a630_vk_sysmem:
 .baremetal-test:
   extends:
     - .ci-run-policy
+    - .test
   stage: test
   artifacts:
     when: always
@@ -980,7 +983,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"
+    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

.gitlab-ci/bare-metal/init.sh

@@ -12,11 +12,6 @@ mount -t devpts devpts /dev/pts
 
 echo "nameserver 8.8.8.8" > /etc/resolv.conf
 
-export DEQP_SKIPS=deqp-skips.txt
-if [ -e /install/deqp-expected-fails.txt ]; then
-  export DEQP_EXPECTED_FAILS=deqp-expected-fails.txt
-fi
-
 if sh $BARE_METAL_TEST_SCRIPT; then
     echo "bare-metal result: pass"
 else

.gitlab-ci/bare-metal/rootfs-setup.sh

@@ -24,10 +24,12 @@ for var in \
     CI_PIPELINE_ID \
     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 \
     FD_MESA_DEBUG \
     FLAKES_CHANNEL \
@@ -47,10 +49,3 @@ set -x
 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
-
-# Copy the deqp runner script and metadata.
-cp .gitlab-ci/deqp-runner.sh $rootfs_dst/deqp/
-cp .gitlab-ci/$DEQP_SKIPS $rootfs_dst/$CI_PROJECT_DIR/install/deqp-skips.txt
-if [ -n "$DEQP_EXPECTED_FAILS" ]; then
-  cp .gitlab-ci/$DEQP_EXPECTED_FAILS $rootfs_dst/$CI_PROJECT_DIR/install/deqp-expected-fails.txt
-fi