ci/baremetal: Split baremetal_arm64_test to -gl and -vk

While all the arm32 jobs are testing GL, there are both GL and VK arm64
jobs. This is required to be able to use the rootfs from the test-*
containers.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34451>

.gitlab-ci/container/debian/baremetal_arm64_test-vk.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -e
+
+arch=arm64 . .gitlab-ci/container/debian/baremetal_arm_test.sh

.gitlab-ci/container/gitlab-ci.yml

@@ -702,43 +702,57 @@ kernel+rootfs_arm32:
     MESA_ARTIFACTS_TAG: *debian-arm64_build
     MESA_ROOTFS_TAG: *kernel-rootfs
 
-debian/baremetal_arm32_test:
+debian/baremetal_arm32_test-gl:
   extends:
     - .debian/baremetal_arm_test
   needs:
     - kernel+rootfs_arm32
   variables:
-    MESA_IMAGE_TAG: &debian-arm32_test "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
+    MESA_IMAGE_TAG: &baremetal-arm32_test-gl "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
 
-debian/baremetal_arm64_test:
+debian/baremetal_arm64_test-gl:
   extends:
     - .debian/baremetal_arm_test
   needs:
-    - kernel+rootfs_arm64
+    - debian/arm64_test-gl
   variables:
-    MESA_IMAGE_TAG: &debian-arm64_test "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
+    MESA_IMAGE_TAG: &baremetal-arm64_test-gl "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
 
-.use-debian/baremetal_arm_test:
+debian/baremetal_arm64_test-vk:
+  extends:
+    - .debian/baremetal_arm_test
+  needs:
+    - debian/arm64_test-vk
   variables:
-    MESA_ROOTFS_TAG: *kernel-rootfs
+    MESA_IMAGE_TAG: &baremetal-arm64_test-vk "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
 
-.use-debian/baremetal_arm32_test:
+.use-debian/baremetal_arm32_test-gl:
   image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}"
   extends:
     - .use-debian/baremetal_arm_test
   variables:
-    MESA_IMAGE_PATH: "debian/baremetal_arm32_test"
-    MESA_IMAGE_TAG: *debian-arm32_test
+    MESA_IMAGE_PATH: "debian/baremetal_arm32_test-gl"
+    MESA_IMAGE_TAG: *baremetal-arm32_test-gl
   needs:
     - debian/baremetal_arm_test
 
-.use-debian/baremetal_arm64_test:
+.use-debian/baremetal_arm64_test-gl:
   image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}"
   extends:
     - .use-debian/baremetal_arm_test
   variables:
-    MESA_IMAGE_PATH: "debian/baremetal_arm64_test"
-    MESA_IMAGE_TAG: *debian-arm64_test
+    MESA_IMAGE_PATH: "debian/baremetal_arm64_test-gl"
+    MESA_IMAGE_TAG: *baremetal-arm64_test-gl
+  needs:
+    - debian/baremetal_arm_test
+
+.use-debian/baremetal_arm64_test-vk:
+  image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}"
+  extends:
+    - .use-debian/baremetal_arm_test
+  variables:
+    MESA_IMAGE_PATH: "debian/baremetal_arm64_test-vk"
+    MESA_IMAGE_TAG: *baremetal-arm64_test-vk
   needs:
     - debian/baremetal_arm_test