ci: split arm_test into arm{hf,64}_test

Every barebone arm or aarch64 job depends on these.
When experimenting with CI, this job drags both kernel+rootfs_arm64 and armhf,
even when the latter is not used.

This should speed up development and relieve one instance for about 30 minutes
and overlap between finishing kernel+rootfs_arm64 and armhf jobs per change.

Here are some size stats:
old arm_test   904M (32+64)
new arm64_test 579M (64bit)
new armhf_test 402M (32bit)
---
both     ~ 981M (overhead is 81M overall, but never used together so it's only cost "at rest")

Runtime of the arm*_test jobs is ~ 2 minutes.

Acked-by: Martin Roukala <martin.roukala@mupuf.org>
Acked-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: "Sergi Blanch Torné" <sergi.blanch.torne@collabora.com>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19550>

.gitlab-ci/container/debian/arm64_test.sh

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

.gitlab-ci/container/debian/arm_test.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=SC2154 # arch is assigned in previous scripts
 
 set -e
 set -o xtrace
@@ -25,12 +26,13 @@ apt-get install -y --no-remove \
 wget https://raw.githubusercontent.com/net-snmp/net-snmp/master/mibs/SNMPv2-SMI.txt \
     -O /usr/share/snmp/mibs/SNMPv2-SMI.txt
 
-arch=arm64 . .gitlab-ci/container/baremetal_build.sh
-arch=armhf . .gitlab-ci/container/baremetal_build.sh
+. .gitlab-ci/container/baremetal_build.sh
 
-# This firmware file from Debian bullseye causes hangs
-wget https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/qcom/a530_pfp.fw?id=d5f9eea5a251d43412b07f5295d03e97b89ac4a5 \
-     -O /rootfs-arm64/lib/firmware/qcom/a530_pfp.fw
+if [[ "$arch" == "arm64" ]]; then
+    # This firmware file from Debian bullseye causes hangs
+    wget https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/qcom/a530_pfp.fw?id=d5f9eea5a251d43412b07f5295d03e97b89ac4a5 \
+      -O /rootfs-arm64/lib/firmware/qcom/a530_pfp.fw
+fi
 
 mkdir -p /baremetal-files/jetson-nano/boot/
 ln -s \

.gitlab-ci/container/debian/armhf_test.sh

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

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

@@ -340,30 +340,57 @@ kernel+rootfs_armhf:
     MESA_ROOTFS_TAG: *kernel-rootfs
 
 # x86 image with ARM64 & armhf kernel & rootfs for baremetal testing
-debian/arm_test:
+.debian/arm_test:
   extends:
     - .fdo.container-build@debian
     - .container
     # Don't want the .container rules
     - .build-rules
-  needs:
-    - kernel+rootfs_arm64
-    - kernel+rootfs_armhf
   variables:
     FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}"
     ARTIFACTS_PREFIX: "https://${MINIO_HOST}/mesa-lava"
     ARTIFACTS_SUFFIX: "${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}"
     MESA_ARM_BUILD_TAG: *debian-arm_build
-    MESA_IMAGE_TAG: &debian-arm_test ${DEBIAN_BASE_TAG}
     MESA_ROOTFS_TAG: *kernel-rootfs
 
+debian/armhf_test:
+  extends:
+    - .debian/arm_test
+  needs:
+    - kernel+rootfs_armhf
+  variables:
+    MESA_IMAGE_TAG: &debian-armhf_test ${DEBIAN_BASE_TAG}
+
+debian/arm64_test:
+  extends:
+    - .debian/arm_test
+  needs:
+    - kernel+rootfs_arm64
+  variables:
+    MESA_IMAGE_TAG: &debian-arm64_test ${DEBIAN_BASE_TAG}
+
 .use-debian/arm_test:
-  image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}"
   variables:
     MESA_ARM_BUILD_TAG: *debian-arm_build
-    MESA_IMAGE_PATH: "debian/arm_test"
-    MESA_IMAGE_TAG: *debian-arm_test
     MESA_ROOTFS_TAG: *kernel-rootfs
+
+.use-debian/armhf_test:
+  image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}"
+  extends:
+    - .use-debian/arm_test
+  variables:
+    MESA_IMAGE_PATH: "debian/armhf_test"
+    MESA_IMAGE_TAG: *debian-armhf_test
+  needs:
+    - debian/arm_test
+
+.use-debian/arm64_test:
+  image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}"
+  extends:
+    - .use-debian/arm_test
+  variables:
+    MESA_IMAGE_PATH: "debian/arm64_test"
+    MESA_IMAGE_TAG: *debian-arm64_test
   needs:
     - debian/arm_test
 

.gitlab-ci/image-tags.yml

@@ -1,6 +1,6 @@
 variables:
    DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base"
-   DEBIAN_BASE_TAG: "2022-11-08-deqp-runner"
+   DEBIAN_BASE_TAG: "2022-11-22-arm-test-split-1"
 
    DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
    DEBIAN_BUILD_TAG: "2022-11-03-ci-fairy-s3"

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

@@ -152,12 +152,12 @@ rustfmt:
 .baremetal-test-armhf:
   extends:
     - .baremetal-test
-    - .use-debian/arm_test
+    - .use-debian/armhf_test
   variables:
     BM_ROOTFS: /rootfs-armhf
     MINIO_ARTIFACT_NAME: mesa-armhf
   needs:
-    - debian/arm_test
+    - debian/armhf_test
     - job: debian-armhf
       artifacts: false
 
@@ -165,12 +165,12 @@ rustfmt:
 .baremetal-test-arm64:
   extends:
     - .baremetal-test
-    - .use-debian/arm_test
+    - .use-debian/arm64_test
   variables:
     BM_ROOTFS: /rootfs-arm64
     MINIO_ARTIFACT_NAME: mesa-arm64
   needs:
-    - debian/arm_test
+    - debian/arm64_test
     - job: debian-arm64
       artifacts: false
 
@@ -178,12 +178,12 @@ rustfmt:
 .baremetal-arm64-asan-test:
   extends:
     - .baremetal-test
-    - .use-debian/arm_test
+    - .use-debian/arm64_test
   variables:
     DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.6:/install/lib/libdlclose-skip.so"
     MINIO_ARTIFACT_NAME: mesa-arm64-asan
   needs:
-    - debian/arm_test
+    - debian/arm64_test
     - job: debian-arm64-asan
       artifacts: false