From 7208344abe2dbfa2d8bd954b855b87af54eea1cc Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Thu, 1 May 2025 15:19:30 +0200
Subject: [PATCH] etnaviv/ci: split model and revision tags

This was working by accident because (we believe) GitLab internally
serializes/deserializes the tags list as a comma-separated list, but
this is not documented and therefore liable to break with any update, so
let's explicitly set two separate tags instead.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34795>
---
 src/etnaviv/ci/gitlab-ci.yml | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/etnaviv/ci/gitlab-ci.yml b/src/etnaviv/ci/gitlab-ci.yml
index c69ccdba9a7..2110df0a206 100644
--- a/src/etnaviv/ci/gitlab-ci.yml
+++ b/src/etnaviv/ci/gitlab-ci.yml
@@ -37,7 +37,9 @@
     B2C_TIMEOUT_FIRST_CONSOLE_ACTIVITY_SECONDS: 30
     B2C_TIMEOUT_FIRST_CONSOLE_ACTIVITY_RETRIES: 3
     B2C_IMAGESTORE_PLATFORM: linux/arm/v7
-    B2C_MARS_SETUP_TAGS: "vivante:model:2000,vivante:revision:5108"
+    VIVANTE_MODEL_TAG: "vivante:model:2000"
+    VIVANTE_REVISION_TAG: "vivante:revision:5108"
+    B2C_MARS_SETUP_TAGS: "$VIVANTE_MODEL_TAG,$VIVANTE_REVISION_TAG"
     GPU_VERSION: "etnaviv-gc2000-r5108"
 
 # 1 device (2025-01-30)
@@ -49,7 +51,8 @@
   tags:
     - farm:$RUNNER_FARM_LOCATION
     - cpu:cores:2
-    - $B2C_MARS_SETUP_TAGS
+    - $VIVANTE_MODEL_TAG
+    - $VIVANTE_REVISION_TAG
 
 # 4 devices (2025-01-30)
 .austriancoder-imx6q-cubox-i-4cores:arm32:
@@ -60,7 +63,8 @@
   tags:
     - farm:$RUNNER_FARM_LOCATION
     - cpu:cores:4
-    - $B2C_MARS_SETUP_TAGS
+    - $VIVANTE_MODEL_TAG
+    - $VIVANTE_REVISION_TAG
 
 # 2 devices (2025-02-28)
 .austriancoder-imx6qp-nitrogen6_max:arm32:
@@ -70,11 +74,14 @@
     B2C_TIMEOUT_FIRST_CONSOLE_ACTIVITY_SECONDS: 30
     B2C_TIMEOUT_FIRST_CONSOLE_ACTIVITY_RETRIES: 3
     B2C_IMAGESTORE_PLATFORM: linux/arm/v7
-    B2C_MARS_SETUP_TAGS: "vivante:model:3000,vivante:revision:5450"
+    VIVANTE_MODEL_TAG: "vivante:model:3000"
+    VIVANTE_REVISION_TAG: "vivante:revision:5450"
+    B2C_MARS_SETUP_TAGS: "$VIVANTE_MODEL_TAG,$VIVANTE_REVISION_TAG"
     GPU_VERSION: "etnaviv-gc3000-r5450"
   tags:
     - farm:$RUNNER_FARM_LOCATION
-    - $B2C_MARS_SETUP_TAGS
+    - $VIVANTE_MODEL_TAG
+    - $VIVANTE_REVISION_TAG
 
 # 1 devices (2025-02-26)
 .austriancoder-imx8mq-nitrogen:arm64:
@@ -84,11 +91,14 @@
     B2C_TIMEOUT_FIRST_CONSOLE_ACTIVITY_SECONDS: 30
     B2C_TIMEOUT_FIRST_CONSOLE_ACTIVITY_RETRIES: 3
     B2C_IMAGESTORE_PLATFORM: linux/arm64/v8
-    B2C_MARS_SETUP_TAGS: "vivante:model:7000,vivante:revision:6214"
+    VIVANTE_MODEL_TAG: "vivante:model:7000"
+    VIVANTE_REVISION_TAG: "vivante:revision:6214"
+    B2C_MARS_SETUP_TAGS: "$VIVANTE_MODEL_TAG,$VIVANTE_REVISION_TAG"
     GPU_VERSION: "etnaviv-gc7000-r6214"
   tags:
     - farm:$RUNNER_FARM_LOCATION
-    - $B2C_MARS_SETUP_TAGS
+    - $VIVANTE_MODEL_TAG
+    - $VIVANTE_REVISION_TAG
 
 # 1 devices (2025-02-26)
 # Status: https://lava.pengutronix.de/scheduler/device_type/imx8mp-tqma8mpql-mba8mpxl