ci/image-tags: rename DEBIAN_X86_64_TEST_*_TAG to drop the x86 mention

We're about to add ARM images using this same infra.

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

.gitlab-ci.yml

@@ -297,9 +297,9 @@ sanity:
       image_tags=(
         DEBIAN_BASE_TAG
         DEBIAN_BUILD_TAG
-        DEBIAN_X86_64_TEST_ANDROID_TAG
+        DEBIAN_TEST_ANDROID_TAG
-        DEBIAN_X86_64_TEST_GL_TAG
+        DEBIAN_TEST_GL_TAG
-        DEBIAN_X86_64_TEST_VK_TAG
+        DEBIAN_TEST_VK_TAG
         ALPINE_X86_64_BUILD_TAG
         ALPINE_X86_64_LAVA_SSH_TAG
         FEDORA_X86_64_BUILD_TAG

.gitlab-ci/container/build-apitrace.sh

@@ -3,8 +3,8 @@
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_X86_64_TEST_GL_TAG
+# DEBIAN_TEST_GL_TAG
-# DEBIAN_X86_64_TEST_VK_TAG
+# DEBIAN_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG
 
 set -ex

.gitlab-ci/container/build-deqp-runner.sh

@@ -3,9 +3,9 @@
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_X86_64_TEST_ANDROID_TAG
+# DEBIAN_TEST_ANDROID_TAG
-# DEBIAN_X86_64_TEST_GL_TAG
+# DEBIAN_TEST_GL_TAG
-# DEBIAN_X86_64_TEST_VK_TAG
+# DEBIAN_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG
 
 set -ex

.gitlab-ci/container/build-deqp.sh

@@ -3,9 +3,9 @@
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_X86_64_TEST_ANDROID_TAG
+# DEBIAN_TEST_ANDROID_TAG
-# DEBIAN_X86_64_TEST_GL_TAG
+# DEBIAN_TEST_GL_TAG
-# DEBIAN_X86_64_TEST_VK_TAG
+# DEBIAN_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG
 
 set -ex -o pipefail

.gitlab-ci/container/build-fossilize.sh

@@ -2,7 +2,7 @@
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_X86_64_TEST_VK_TAG
+# DEBIAN_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG
 
 set -ex

.gitlab-ci/container/build-ninetests.sh

@@ -2,7 +2,7 @@
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_X86_64_TEST_GL_TAG
+# DEBIAN_TEST_GL_TAG
 
 set -ex -o pipefail
 

.gitlab-ci/container/build-piglit.sh

@@ -4,8 +4,8 @@ set -ex
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_X86_64_TEST_GL_TAG
+# DEBIAN_TEST_GL_TAG
-# DEBIAN_X86_64_TEST_VK_TAG
+# DEBIAN_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG
 
 REV="8a6ce9c6fc5c8039665655bca4904d5601c6dba0"

.gitlab-ci/container/build-vkd3d-proton.sh

@@ -2,7 +2,7 @@
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_X86_64_TEST_VK_TAG
+# DEBIAN_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG
 set -ex
 

.gitlab-ci/container/build-vulkan-validation.sh

@@ -2,7 +2,7 @@
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_X86_64_TEST_GL_TAG
+# DEBIAN_TEST_GL_TAG
 # KERNEL_ROOTFS_TAG:
 
 set -ex

.gitlab-ci/container/build-wayland.sh

@@ -6,9 +6,9 @@ set -ex
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
 # DEBIAN_BUILD_TAG
-# DEBIAN_X86_64_TEST_ANDROID_TAG
+# DEBIAN_TEST_ANDROID_TAG
-# DEBIAN_X86_64_TEST_GL_TAG
+# DEBIAN_TEST_GL_TAG
-# DEBIAN_X86_64_TEST_VK_TAG
+# DEBIAN_TEST_VK_TAG
 # FEDORA_X86_64_BUILD_TAG
 # KERNEL_ROOTFS_TAG
 

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

@@ -202,7 +202,7 @@ debian/x86_64_test-base:
 debian/x86_64_test-gl:
   extends: .use-debian/x86_64_test-base
   variables:
-    MESA_IMAGE_TAG: &debian-x86_64_test-gl ${DEBIAN_X86_64_TEST_GL_TAG}
+    MESA_IMAGE_TAG: &debian-x86_64_test-gl ${DEBIAN_TEST_GL_TAG}
 
 .use-debian/x86_64_test-gl:
   extends:
@@ -218,7 +218,7 @@ debian/x86_64_test-gl:
 debian/x86_64_test-vk:
   extends: .use-debian/x86_64_test-base
   variables:
-    MESA_IMAGE_TAG: &debian-x86_64_test-vk ${DEBIAN_X86_64_TEST_VK_TAG}
+    MESA_IMAGE_TAG: &debian-x86_64_test-vk ${DEBIAN_TEST_VK_TAG}
 
 .use-debian/x86_64_test-vk:
   extends:
@@ -234,7 +234,7 @@ debian/x86_64_test-vk:
 .debian/x86_64_test-android:
   extends: .use-debian/x86_64_test-base
   variables:
-    MESA_IMAGE_TAG: &debian-x86_64_test-android ${DEBIAN_X86_64_TEST_ANDROID_TAG}
+    MESA_IMAGE_TAG: &debian-x86_64_test-android ${DEBIAN_TEST_ANDROID_TAG}
     ANDROID_NDK: android-ndk-r25b
 
 .use-debian/x86_64_test-android:

.gitlab-ci/image-tags.yml

@@ -24,9 +24,9 @@ variables:
    DEBIAN_X86_64_TEST_IMAGE_VK_PATH: "debian/x86_64_test-vk"
    DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
 
-   DEBIAN_X86_64_TEST_ANDROID_TAG: "20240423-deqp"
+   DEBIAN_TEST_ANDROID_TAG: "20240423-deqp"
-   DEBIAN_X86_64_TEST_GL_TAG: "20240515-piglit-8a"
+   DEBIAN_TEST_GL_TAG: "20240515-piglit-8a"
-   DEBIAN_X86_64_TEST_VK_TAG: "20240515-piglit-8a"
+   DEBIAN_TEST_VK_TAG: "20240515-piglit-8a"
    KERNEL_ROOTFS_TAG: "20240516-angle"
 
    ALPINE_X86_64_BUILD_TAG: "20240517-m0ld"