ci: rename debian/arm*_test to debian/baremetal_arm*_test to be clear about which infra uses that

Signed-off-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29241>

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

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

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

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

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

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

.gitlab-ci/container/debian/baremetal_arm64_test.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

@@ -368,7 +368,7 @@ kernel+rootfs_arm32:
     MESA_ROOTFS_TAG: *kernel-rootfs
 
 # x86_64 image with ARM64 & ARM32 kernel & rootfs for baremetal testing
-.debian/arm_test:
+.debian/baremetal_arm_test:
   extends:
     - .fdo.container-build@debian
     - .container
@@ -382,45 +382,45 @@ kernel+rootfs_arm32:
     MESA_ARTIFACTS_TAG: *debian-arm64_build
     MESA_ROOTFS_TAG: *kernel-rootfs
 
-debian/arm32_test:
+debian/baremetal_arm32_test:
   extends:
-    - .debian/arm_test
+    - .debian/baremetal_arm_test
   needs:
     - kernel+rootfs_arm32
   variables:
     MESA_IMAGE_TAG: &debian-arm32_test "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
 
-debian/arm64_test:
+debian/baremetal_arm64_test:
   extends:
-    - .debian/arm_test
+    - .debian/baremetal_arm_test
   needs:
     - kernel+rootfs_arm64
   variables:
     MESA_IMAGE_TAG: &debian-arm64_test "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
 
-.use-debian/arm_test:
+.use-debian/baremetal_arm_test:
   variables:
     MESA_ROOTFS_TAG: *kernel-rootfs
 
-.use-debian/arm32_test:
+.use-debian/baremetal_arm32_test:
   image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}"
   extends:
-    - .use-debian/arm_test
+    - .use-debian/baremetal_arm_test
   variables:
-    MESA_IMAGE_PATH: "debian/arm32_test"
+    MESA_IMAGE_PATH: "debian/baremetal_arm32_test"
     MESA_IMAGE_TAG: *debian-arm32_test
   needs:
-    - debian/arm_test
+    - debian/baremetal_arm_test
 
-.use-debian/arm64_test:
+.use-debian/baremetal_arm64_test:
   image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}"
   extends:
-    - .use-debian/arm_test
+    - .use-debian/baremetal_arm_test
   variables:
-    MESA_IMAGE_PATH: "debian/arm64_test"
+    MESA_IMAGE_PATH: "debian/baremetal_arm64_test"
     MESA_IMAGE_TAG: *debian-arm64_test
   needs:
-    - debian/arm_test
+    - debian/baremetal_arm_test
 
 # Native Windows docker builds
 #

.gitlab-ci/image-tags.yml

@@ -13,7 +13,7 @@
 
 variables:
    DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
-   DEBIAN_BASE_TAG: "20240509-meson"
+   DEBIAN_BASE_TAG: "20240516-rename-arm"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
    DEBIAN_BUILD_TAG: "20240509-bindgen"

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

@@ -125,7 +125,7 @@
   extends:
     - .piglit-performance-base
   needs:
-    - debian/arm64_test
+    - debian/baremetal_arm64_test
     - debian-arm64-release
 
 .piglit-performance:x86_64:

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

@@ -211,12 +211,12 @@ python-test:
 .baremetal-test-arm32:
   extends:
     - .baremetal-test
-    - .use-debian/arm32_test
+    - .use-debian/baremetal_arm32_test
   variables:
     DEBIAN_ARCH: armhf
     S3_ARTIFACT_NAME: mesa-arm32-default-debugoptimized
   needs:
-    - debian/arm32_test
+    - debian/baremetal_arm32_test
     - job: debian-arm32
       artifacts: false
     - !reference [.required-for-hardware-jobs, needs]
@@ -225,12 +225,12 @@ python-test:
 .baremetal-test-arm64:
   extends:
     - .baremetal-test
-    - .use-debian/arm64_test
+    - .use-debian/baremetal_arm64_test
   variables:
     DEBIAN_ARCH: arm64
     S3_ARTIFACT_NAME: mesa-arm64-default-debugoptimized
   needs:
-    - debian/arm64_test
+    - debian/baremetal_arm64_test
     - job: debian-arm64
       artifacts: false
     - !reference [.required-for-hardware-jobs, needs]
@@ -239,12 +239,12 @@ python-test:
 .baremetal-arm32-asan-test:
   extends:
     - .baremetal-test
-    - .use-debian/arm32_test
+    - .use-debian/baremetal_arm32_test
   variables:
     DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so"
     S3_ARTIFACT_NAME: mesa-arm32-asan-debugoptimized
   needs:
-    - debian/arm32_test
+    - debian/baremetal_arm32_test
     - job: debian-arm32-asan
       artifacts: false
     - !reference [.required-for-hardware-jobs, needs]
@@ -252,12 +252,12 @@ python-test:
 .baremetal-arm64-asan-test:
   extends:
     - .baremetal-test
-    - .use-debian/arm64_test
+    - .use-debian/baremetal_arm64_test
   variables:
     DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so"
     S3_ARTIFACT_NAME: mesa-arm64-asan-debugoptimized
   needs:
-    - debian/arm64_test
+    - debian/baremetal_arm64_test
     - job: debian-arm64-asan
       artifacts: false
     - !reference [.required-for-hardware-jobs, needs]

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

@@ -179,7 +179,7 @@
     # Ensure that we are using the release build artifact
     S3_ARTIFACT_NAME: mesa-arm64-default-release
   needs:
-    - debian/arm64_test
+    - debian/baremetal_arm64_test
     - debian-arm64-release
   dependencies: null