From 8614baa5f8b090d833f1bd33ee7fbdc8d82d5780 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Thu, 3 Apr 2025 10:48:20 +0200
Subject: [PATCH] ci: rename ci-tron priority tag to avoid conflict with the
 generic fdo runners

Otherwise, ci-tron runners with that tag could pick up jobs meant for the fdo
runners, as happened here:
https://gitlab.freedesktop.org/mesa/mesa/-/jobs/73883719

The inverse (fdo runners picking up a job meant for a ci-tron runner) is not
possible though, as ci-tron jobs always include a `farm:$RUNNER_FARM_LOCATION`
tag, so the problem only exists in the other direction.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34358>
(cherry picked from commit 6331441e24ccae9b36f9fcdab481673575f6d0fd)
---
 .gitlab-ci.yml                            | 4 ++--
 .pick_status.json                         | 2 +-
 src/amd/ci/gitlab-ci-inc.yml              | 2 +-
 src/gallium/drivers/zink/ci/gitlab-ci.yml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5dc4ab5f2ff..4c0ec1d33f8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ workflow:
     - if: &is-merge-attempt $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"
       variables:
         MESA_CI_PERFORMANCE_ENABLED: 1
-        VALVE_INFRA_VANGOGH_JOB_PRIORITY: ""  # Empty tags are ignored by gitlab
+        CI_TRON_JOB_PRIORITY_TAG: ""  # Empty tags are ignored by gitlab
         JOB_PRIORITY: 75
         # fast-fail in merge pipelines: stop early if we get this many unexpected fails/crashes
         DEQP_RUNNER_MAX_FAILS: 40
@@ -110,7 +110,7 @@ variables:
   # Avoid the wall of "Unsupported SPIR-V capability" warnings in CI job log, hiding away useful output
   MESA_SPIRV_LOG_LEVEL: error
   # Default priority for non-merge pipelines
-  VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low
+  CI_TRON_JOB_PRIORITY_TAG: ci-tron:priority:low
   JOB_PRIORITY: 50
   DATA_STORAGE_PATH: data_storage
 
diff --git a/.pick_status.json b/.pick_status.json
index 18a1cc212de..b3650718fba 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -694,7 +694,7 @@
         "description": "ci: rename ci-tron priority tag to avoid conflict with the generic fdo runners",
         "nominated": false,
         "nomination_type": 0,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml
index d3dad56d3c6..2be990a6e12 100644
--- a/src/amd/ci/gitlab-ci-inc.yml
+++ b/src/amd/ci/gitlab-ci-inc.yml
@@ -406,7 +406,7 @@
   tags:
     - farm:$RUNNER_FARM_LOCATION
     - amdgpu:codename:VANGOGH
-    - $VALVE_INFRA_VANGOGH_JOB_PRIORITY
+    - $CI_TRON_JOB_PRIORITY_TAG
 
 .navi31-test-valve:
   variables:
diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml
index e87cb0c1fd8..530ace61de1 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml
@@ -212,7 +212,7 @@ zink-radv-vangogh-valve:
     B2C_TIMEOUT_OVERALL_MINUTES: 30
     FDO_CI_CONCURRENT: 6
     ZINK_DEBUG: vvl
-  # Override the list of tags to drop `priority:low`
+  # Override the list of tags to drop `ci-tron:priority:low`
   tags:
     - farm:$RUNNER_FARM_LOCATION
     - amdgpu:codename:VANGOGH