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
 

.gitlab-ci/test-source-dep.yml

@@ -133,7 +133,7 @@
   extends:
     - .piglit-performance-base
   needs:
-    - debian/baremetal_arm64_test
+    - debian/baremetal_arm64_test-gl
     - debian-arm64-release
 
 # Mesa source file dependencies that may impact any GL driver test job.

.gitlab-ci/test/gitlab-ci.yml

@@ -268,62 +268,98 @@ yaml-toml-shell-py-test:
       junit: results/junit.xml
 
 # ARM testing of bare-metal boards attached to an x86 gitlab-runner system
-.baremetal-test-arm32:
+.baremetal-test-arm32-gl:
   extends:
     - .baremetal-test
-    - .use-debian/baremetal_arm32_test
+    - .use-debian/baremetal_arm32_test-gl
   variables:
     DEBIAN_ARCH: armhf
     S3_ARTIFACT_NAME: mesa-arm32-default-debugoptimized
   needs:
-    - debian/baremetal_arm32_test
+    - debian/baremetal_arm32_test-gl
     - job: debian-arm32
       artifacts: false
     - !reference [.required-for-hardware-jobs, needs]
 
 # ARM64 testing of bare-metal boards attached to an x86 gitlab-runner system
-.baremetal-test-arm64:
+.baremetal-test-arm64-gl:
   extends:
     - .baremetal-test
-    - .use-debian/baremetal_arm64_test
+    - .use-debian/baremetal_arm64_test-gl
   variables:
     DEBIAN_ARCH: arm64
     S3_ARTIFACT_NAME: mesa-arm64-default-debugoptimized
   needs:
-    - debian/baremetal_arm64_test
+    - debian/baremetal_arm64_test-gl
+    - job: debian-arm64
+      artifacts: false
+    - !reference [.required-for-hardware-jobs, needs]
+
+# ARM64 testing of bare-metal boards attached to an x86 gitlab-runner system
+.baremetal-test-arm64-vk:
+  extends:
+    - .baremetal-test
+    - .use-debian/baremetal_arm64_test-vk
+  variables:
+    DEBIAN_ARCH: arm64
+    S3_ARTIFACT_NAME: mesa-arm64-default-debugoptimized
+  needs:
+    - debian/baremetal_arm64_test-vk
     - job: debian-arm64
       artifacts: false
     - !reference [.required-for-hardware-jobs, needs]
 
 # ARM32/64 testing of bare-metal boards attached to an x86 gitlab-runner system, using an asan mesa build
-.baremetal-arm32-asan-test:
+.baremetal-arm32-asan-test-gl:
   variables:
     S3_ARTIFACT_NAME: mesa-arm32-asan-debugoptimized
     DEQP_FORCE_ASAN: 1
   needs:
-    - debian/baremetal_arm32_test
+    - debian/baremetal_arm32_test-gl
     - job: debian-arm32-asan
       artifacts: false
     - !reference [.required-for-hardware-jobs, needs]
 
-.baremetal-arm64-asan-test:
+.baremetal-arm64-asan-test-gl:
   variables:
     S3_ARTIFACT_NAME: mesa-arm64-asan-debugoptimized
     DEQP_FORCE_ASAN: 1
   needs:
-    - debian/baremetal_arm64_test
+    - debian/baremetal_arm64_test-gl
     - job: debian-arm64-asan
       artifacts: false
     - !reference [.required-for-hardware-jobs, needs]
 
-.baremetal-arm64-ubsan-test:
+.baremetal-arm64-asan-test-vk:
+  variables:
+    S3_ARTIFACT_NAME: mesa-arm64-asan-debugoptimized
+    DEQP_FORCE_ASAN: 1
+  needs:
+    - debian/baremetal_arm64_test-vk
+    - job: debian-arm64-asan
+      artifacts: false
+    - !reference [.required-for-hardware-jobs, needs]
+
+.baremetal-arm64-ubsan-test-gl:
   extends:
     - .baremetal-test
-    - .use-debian/baremetal_arm64_test
+    - .use-debian/baremetal_arm64_test-vk
   variables:
     S3_ARTIFACT_NAME: mesa-arm64-ubsan-debugoptimized
   needs:
-    - debian/baremetal_arm64_test
+    - debian/baremetal_arm64_test-vk
+    - job: debian-arm64-ubsan
+      artifacts: false
+    - !reference [.required-for-hardware-jobs, needs]
+
+.baremetal-arm64-ubsan-test-vk:
+  extends:
+    - .baremetal-test
+    - .use-debian/baremetal_arm64_test-vk
+  variables:
+    S3_ARTIFACT_NAME: mesa-arm64-ubsan-debugoptimized
+  needs:
+    - debian/baremetal_arm64_test-vk
     - job: debian-arm64-ubsan
       artifacts: false
     - !reference [.required-for-hardware-jobs, needs]

src/broadcom/ci/gitlab-ci-inc.yml

@@ -160,32 +160,55 @@
     FARM: igalia
   timeout: 25m
 
-.broadcom-test:arm64:
+.broadcom-test:arm64-gl:
   extends:
     - .broadcom-test
-    - .baremetal-test-arm64
+    - .baremetal-test-arm64-gl
   variables:
     BM_BOOTFS: /boot/raspberrypi_arm64
 
-.broadcom-test-full:arm64:
+.broadcom-test:arm64-vk:
   extends:
-    - .broadcom-test:arm64
+    - .broadcom-test
+    - .baremetal-test-arm64-vk
+  variables:
+    BM_BOOTFS: /boot/raspberrypi_arm64
+
+.broadcom-test-full:arm64-gl:
+  extends:
+    - .broadcom-test:arm64-gl
   variables:
     BM_BOOTFS: /boot/raspberrypi_arm64_full
 
-.broadcom-asan-test:arm64:
+.broadcom-test-full:arm64-vk:
   extends:
-    - .broadcom-test:arm64
-    - .baremetal-arm64-asan-test
+    - .broadcom-test:arm64-vk
+  variables:
+    BM_BOOTFS: /boot/raspberrypi_arm64_full
 
-.broadcom-ubsan-test:arm64:
+.broadcom-asan-test:arm64-gl:
   extends:
-    - .broadcom-test:arm64
-    - .baremetal-arm64-ubsan-test
+    - .broadcom-test:arm64-gl
+    - .baremetal-arm64-asan-test-gl
 
-.broadcom-test:arm32:
+.broadcom-asan-test:arm64-vk:
+  extends:
+    - .broadcom-test:arm64-vk
+    - .baremetal-arm64-asan-test-vk
+
+.broadcom-ubsan-test:arm64-gl:
+  extends:
+    - .broadcom-test:arm64-gl
+    - .baremetal-arm64-ubsan-test-gl
+
+.broadcom-ubsan-test:arm64-vk:
+  extends:
+    - .broadcom-test:arm64-vk
+    - .baremetal-arm64-ubsan-test-vk
+
+.broadcom-test:arm32-gl:
   extends:
     - .broadcom-test
-    - .baremetal-test-arm32
+    - .baremetal-test-arm32-gl
   variables:
     BM_BOOTFS: /boot/raspberrypi_arm32

src/broadcom/ci/gitlab-ci.yml

@@ -4,7 +4,7 @@ include:
 vc4-rpi3-gl:arm64:
   extends:
     - .igalia-bcm2837-rpi-3-b
-    - .broadcom-test:arm64
+    - .broadcom-test:arm64-gl
     - .test-piglit
     - .vc4-rules
   parallel: 3
@@ -25,7 +25,7 @@ vc4-rpi3-gl-piglit-full:arm64:
 vc4-rpi3-gl:arm32:
   extends:
     - .igalia-bcm2837-rpi-3-b
-    - .broadcom-test:arm32
+    - .broadcom-test:arm32-gl
     - .vc4-manual-rules
   tags:
     - igalia-rpi3
@@ -36,7 +36,7 @@ vc4-rpi3-gl:arm32:
 vc4-rpi3-gl-asan:arm64:
   extends:
     - .igalia-bcm2837-rpi-3-b
-    - .broadcom-asan-test:arm64
+    - .broadcom-asan-test:arm64-gl
     - .vc4-manual-rules
   variables:
     FDO_CI_CONCURRENT: 1
@@ -47,7 +47,7 @@ vc4-rpi3-gl-asan:arm64:
 vc4-rpi3-gl-ubsan:arm64:
   extends:
     - .igalia-bcm2837-rpi-3-b
-    - .broadcom-ubsan-test:arm64
+    - .broadcom-ubsan-test:arm64-gl
     - .vc4-manual-rules
   variables:
     # UBSan is quite slow, so restrict to 1 job
@@ -59,7 +59,7 @@ vc4-rpi3-gl-ubsan:arm64:
 v3d-rpi4-gl:arm64:
   extends:
     - .igalia-bcm2711-rpi-4
-    - .broadcom-test:arm64
+    - .broadcom-test:arm64-gl
     - .test-piglit
     - .v3d-rules
   parallel: 8
@@ -70,7 +70,7 @@ v3d-rpi4-gl:arm64:
 v3d-rpi4-gl-full:arm64:
   extends:
     - v3d-rpi4-gl:arm64
-    - .broadcom-test-full:arm64
+    - .broadcom-test-full:arm64-gl
     - .v3d-manual-rules
   tags:
     - igalia-rpi4
@@ -83,7 +83,7 @@ v3d-rpi4-gl-full:arm64:
 v3d-rpi4-rusticl:arm64:
   extends:
     - .igalia-bcm2711-rpi-4
-    - .broadcom-test:arm64
+    - .broadcom-test:arm64-gl
     - .test-piglit
     - .v3d-rusticl-manual-rules
   timeout: 40m  # base run time = 25min test, 32min total
@@ -94,7 +94,7 @@ v3d-rpi4-traces:arm64:
   extends:
     - .igalia-bcm2711-rpi-4
     - .piglit-traces-test
-    - .broadcom-test:arm64
+    - .broadcom-test:arm64-gl
     - .v3d-rules
   variables:
     HWCI_TEST_SCRIPT: "/install/piglit/piglit-traces.sh"
@@ -105,7 +105,7 @@ v3d-rpi4-traces:arm64:
 v3d-rpi4-gl:arm32:
   extends:
     - .igalia-bcm2711-rpi-4
-    - .broadcom-test:arm32
+    - .broadcom-test:arm32-gl
     - .v3d-manual-rules
   tags:
     - igalia-rpi4
@@ -117,7 +117,7 @@ v3d-rpi4-gl:arm32:
 v3d-rpi4-gl-asan:arm64:
   extends:
     - .igalia-bcm2711-rpi-4
-    - .broadcom-asan-test:arm64
+    - .broadcom-asan-test:arm64-gl
     - .v3d-manual-rules
   variables:
     FDO_CI_CONCURRENT: 1
@@ -129,7 +129,7 @@ v3d-rpi4-gl-asan:arm64:
 v3d-rpi4-gl-ubsan:arm64:
   extends:
     - .igalia-bcm2711-rpi-4
-    - .broadcom-ubsan-test:arm64
+    - .broadcom-ubsan-test:arm64-gl
     - .v3d-manual-rules
   variables:
     # UBSan is quite slow, so restrict to 1 job
@@ -141,7 +141,7 @@ v3d-rpi4-gl-ubsan:arm64:
 v3dv-rpi4-vk:arm64:
   extends:
     - .igalia-bcm2711-rpi-4
-    - .broadcom-test:arm64
+    - .broadcom-test:arm64-vk
     - .v3dv-rules
   parallel: 8
   variables:
@@ -154,7 +154,7 @@ v3dv-rpi4-vk:arm64:
 v3dv-rpi4-vk-full:arm64:
   extends:
     - v3dv-rpi4-vk:arm64
-    - .broadcom-test-full:arm64
+    - .broadcom-test-full:arm64-vk
     - .v3dv-manual-rules
   tags:
     - igalia-rpi4
@@ -169,7 +169,7 @@ v3dv-rpi4-vk-full:arm64:
 v3dv-rpi4-vk-asan:arm64:
   extends:
     - .igalia-bcm2711-rpi-4
-    - .broadcom-asan-test:arm64
+    - .broadcom-asan-test:arm64-vk
     - .v3dv-manual-rules
   variables:
     FDO_CI_CONCURRENT: 1
@@ -180,7 +180,7 @@ v3dv-rpi4-vk-asan:arm64:
 v3dv-rpi4-vk-ubsan:arm64:
   extends:
     - .igalia-bcm2711-rpi-4
-    - .broadcom-ubsan-test:arm64
+    - .broadcom-ubsan-test:arm64-vk
     - .v3dv-manual-rules
   variables:
     # UBSan is quite slow, so restrict to 1 job
@@ -192,7 +192,7 @@ v3dv-rpi4-vk-ubsan:arm64:
 v3d-rpi5-gl:arm64:
   extends:
     - .igalia-bcm2712-rpi-5
-    - .broadcom-test:arm64
+    - .broadcom-test:arm64-gl
     - .test-piglit
     - .v3d-rules
   variables:
@@ -203,7 +203,7 @@ v3d-rpi5-gl:arm64:
 v3d-rpi5-gl-full:arm64:
   extends:
     - v3d-rpi5-gl:arm64
-    - .broadcom-test-full:arm64
+    - .broadcom-test-full:arm64-gl
     - .v3d-manual-rules
   parallel: 2
   tags:
@@ -217,7 +217,7 @@ v3d-rpi5-gl-full:arm64:
 v3d-rpi5-rusticl:arm64:
   extends:
     - .igalia-bcm2712-rpi-5
-    - .broadcom-test:arm64
+    - .broadcom-test:arm64-gl
     - .test-piglit
     - .v3d-rusticl-manual-rules
   tags:
@@ -231,7 +231,7 @@ v3d-rpi5-traces:arm64:
   extends:
     - .igalia-bcm2712-rpi-5
     - .piglit-traces-test
-    - .broadcom-test:arm64
+    - .broadcom-test:arm64-gl
     - .v3d-rules
   variables:
     HWCI_TEST_SCRIPT: "/install/piglit/piglit-traces.sh"
@@ -242,7 +242,7 @@ v3d-rpi5-traces:arm64:
 v3dv-rpi5-vk:arm64:
   extends:
     - .igalia-bcm2712-rpi-5
-    - .broadcom-test:arm64
+    - .broadcom-test:arm64-vk
     - .v3dv-rules
   parallel: 2
   variables:
@@ -255,7 +255,7 @@ v3dv-rpi5-vk:arm64:
 v3dv-rpi5-vk-full:arm64:
   extends:
     - v3dv-rpi5-vk:arm64
-    - .broadcom-test-full:arm64
+    - .broadcom-test-full:arm64-vk
     - .v3dv-manual-rules
   tags:
     - igalia-rpi5

src/freedreno/ci/gitlab-ci-inc.yml

@@ -199,7 +199,7 @@
     # Ensure that we are using the release build artifact
     S3_ARTIFACT_NAME: mesa-arm64-default-release
   needs:
-    - debian/baremetal_arm64_test
+    - debian/baremetal_arm64_test-gl
     - debian-arm64-release
   dependencies: null
 
@@ -272,9 +272,22 @@
     VK_DRIVER: freedreno
 
 
-.google-freedreno-test:
+.google-freedreno-test-gl:
   extends:
-    - .baremetal-test-arm64
+    - .baremetal-test-arm64-gl
+    - .google-freedreno-rules
+  variables:
+    VK_DRIVER: freedreno
+    FLAKES_CHANNEL: "#freedreno-ci"
+    PIGLIT_PLATFORM: mixed_glx_egl
+    BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 $BM_KERNEL_EXTRA_ARGS root=/dev/nfs rw nfsrootdebug nfsroot=,tcp,nfsvers=4.2 init=/init $BM_KERNELARGS"
+    FARM: google
+  script:
+    - ./install/bare-metal/fastboot.sh
+
+.google-freedreno-test-vk:
+  extends:
+    - .baremetal-test-arm64-vk
     - .google-freedreno-rules
   variables:
     VK_DRIVER: freedreno
@@ -297,7 +310,7 @@
 
 .a306-test:
   extends:
-    - .google-freedreno-test
+    - .google-freedreno-test-gl
   variables:
     BM_KERNEL: Image.gz
     BM_DTB: apq8016-sbc-usb-host
@@ -310,7 +323,7 @@
 # 8 devices (2023-04-15)
 .a530-test:
   extends:
-    - .google-freedreno-test
+    - .google-freedreno-test-gl
   variables:
     BM_KERNEL: Image.gz
     BM_DTB: apq8096-db820c
@@ -322,8 +335,6 @@
 
 # 6 devices (2023-07-06)
 .a630-test:
-  extends:
-    - .google-freedreno-test
   variables:
     FDO_CI_CONCURRENT: 10
     BM_KERNEL: cheza-kernel

src/freedreno/ci/gitlab-ci.yml

@@ -301,6 +301,7 @@ a660-vk-full:
 a630-gl:
   extends:
     - .baremetal-deqp-test
+    - .google-freedreno-test-gl
     - .a630-test
   parallel: 3
   variables:
@@ -311,8 +312,9 @@ a630-gl:
 a630-gles-asan:
   extends:
     - .baremetal-deqp-test
+    - .google-freedreno-test-gl
     - .a630-test
-    - .baremetal-arm64-asan-test
+    - .baremetal-arm64-asan-test-gl
   variables:
     DEQP_SUITE: freedreno-a630-gles-asan
     FDO_CI_CONCURRENT: 2 # We get OOMkills if we go too wide with asan enabled
@@ -332,6 +334,7 @@ a630-gles-asan-full:
 
 .a630-vk:
   extends:
+    - .google-freedreno-test-vk
     - .a630-test
     - .baremetal-deqp-test
     - .google-turnip-rules
@@ -355,9 +358,10 @@ a630-vk-full:
 
 a630-vk-asan:
   extends:
+    - .google-freedreno-test-vk
     - .a630-test
     - .baremetal-deqp-test
-    - .baremetal-arm64-asan-test
+    - .baremetal-arm64-asan-test-vk
     - .google-turnip-rules
   variables:
     DEQP_SUITE: freedreno-a630-vk-asan
@@ -365,6 +369,7 @@ a630-vk-asan:
 
 a630-piglit:
   extends:
+    - .google-freedreno-test-gl
     - .baremetal-deqp-test
     - .a630-test
     - .test-piglit
@@ -377,6 +382,7 @@ a630-piglit:
 a630-piglit-full:
   extends:
     - .baremetal-deqp-test
+    - .google-freedreno-test-gl
     - .a630-test
     - .test-piglit
     # Note that piglit has GL+VK integration testing.
@@ -390,6 +396,7 @@ a630-piglit-full:
 a630-traces:
   extends:
     - .google-freedreno-test-traces
+    - .google-freedreno-test-gl
     - .a630-test
   rules:
     - when: never # Google nginx needs updating

src/gallium/drivers/nouveau/ci/gitlab-ci.yml

@@ -3,7 +3,7 @@ include:
 
 .gk20a-gles:
   extends:
-    - .baremetal-test-arm32
+    - .baremetal-test-arm32-gl
     - .nouveau-bm-test
     - .anholt-tegra124-jetson-tk1:arm32
   parallel: 4
@@ -15,7 +15,7 @@ include:
 # Single Jetson Nano board at anholt's house.
 .gm20b-gles-full:
   extends:
-    - .baremetal-test-arm64
+    - .baremetal-test-arm64-gl
     - .nouveau-bm-test
     - .google-tegra210-p3450-0000:arm64
     - .nouveau-manual-rules