From a10ea7cec8ddd4ca2594785bf9c66caef6b259ed Mon Sep 17 00:00:00 2001
From: "Juan A. Suarez Romero" <jasuarez@igalia.com>
Date: Wed, 26 Jun 2024 13:59:11 +0200
Subject: [PATCH] broadcom/ci: remove arch from hardware name

The same device can be run with 32-bits or 64-bits, so no need to
include the arch in the name.

Reviewed-by: Eric Engestrom <eric@igalia.com>
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30003>
---
 src/broadcom/ci/gitlab-ci-inc.yml |  6 +++---
 src/broadcom/ci/gitlab-ci.yml     | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/broadcom/ci/gitlab-ci-inc.yml b/src/broadcom/ci/gitlab-ci-inc.yml
index c47d6cd93de..d6eec98c224 100644
--- a/src/broadcom/ci/gitlab-ci-inc.yml
+++ b/src/broadcom/ci/gitlab-ci-inc.yml
@@ -116,7 +116,7 @@
       when: manual
 
 # 8 devices (2023-12-18)
-.igalia-bcm2837-rpi-3-b:arm64:
+.igalia-bcm2837-rpi-3-b:
   variables:
     DEVICE_TYPE: rpi3
     GPU_VERSION: broadcom-rpi3
@@ -126,7 +126,7 @@
     - igalia-rpi3
 
 # 21 devices (2023-12-18)
-.igalia-bcm2711-rpi-4:arm64:
+.igalia-bcm2711-rpi-4:
   variables:
     DEVICE_TYPE: rpi4
     GPU_VERSION: broadcom-rpi4
@@ -137,7 +137,7 @@
     - igalia-rpi4
 
 # 1 device (2024-01-02)
-.igalia-bcm2712-rpi-5:arm64:
+.igalia-bcm2712-rpi-5:
   variables:
     DEVICE_TYPE: rpi5
     GPU_VERSION: broadcom-rpi5
diff --git a/src/broadcom/ci/gitlab-ci.yml b/src/broadcom/ci/gitlab-ci.yml
index 4e93a45277b..3452d5319ec 100644
--- a/src/broadcom/ci/gitlab-ci.yml
+++ b/src/broadcom/ci/gitlab-ci.yml
@@ -3,7 +3,7 @@ include:
 
 vc4-rpi3-gl:arm32:
   extends:
-    - .igalia-bcm2837-rpi-3-b:arm64
+    - .igalia-bcm2837-rpi-3-b
     - .broadcom-test:arm32
     - .vc4-rules
   parallel: 4
@@ -24,7 +24,7 @@ vc4-rpi3-gl-piglit-full:arm32:
 
 v3d-rpi4-gl:arm64:
   extends:
-    - .igalia-bcm2711-rpi-4:arm64
+    - .igalia-bcm2711-rpi-4
     - .broadcom-test:arm64
     - .v3d-rules
   parallel: 8
@@ -58,7 +58,7 @@ v3d-rpi4-rusticl:arm64:
 
 v3d-rpi4-traces:arm64:
   extends:
-    - .igalia-bcm2711-rpi-4:arm64
+    - .igalia-bcm2711-rpi-4
     - .piglit-traces-test
     - .broadcom-test:arm64
     - .v3d-rules
@@ -71,7 +71,7 @@ v3d-rpi4-traces:arm64:
 
 v3dv-rpi4-vk:arm64:
   extends:
-    - .igalia-bcm2711-rpi-4:arm64
+    - .igalia-bcm2711-rpi-4
     - .broadcom-test:arm64
     - .v3dv-rules
   parallel: 10
@@ -99,7 +99,7 @@ v3dv-rpi4-vk-full:arm64:
 
 .v3dv-rpi5-vk:arm64:
   extends:
-    - .igalia-bcm2712-rpi-5:arm64
+    - .igalia-bcm2712-rpi-5
     - .broadcom-test:arm64
     - .v3dv-rules
   variables: