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 6331441e24)
This commit is contained in:
Eric Engestrom 2025-04-03 10:48:20 +02:00 committed by Eric Engestrom
parent 50e0a3933a
commit 8614baa5f8
4 changed files with 5 additions and 5 deletions

View file

@ -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

View file

@ -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

View file

@ -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:

View file

@ -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