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>
This commit is contained in:
Eric Engestrom
2025-04-03 10:48:20 +02:00
committed by Marge Bot
parent f84578e308
commit 6331441e24
3 changed files with 4 additions and 4 deletions

View File

@@ -41,7 +41,7 @@ workflow:
FDO_RUNNER_JOB_PRIORITY_TAG_X86_64: priority:high
FDO_RUNNER_JOB_PRIORITY_TAG_X86_64_KVM: priority:high-kvm
FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64: priority:high-aarch64
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
@@ -119,7 +119,7 @@ variables:
FDO_RUNNER_JOB_PRIORITY_TAG_X86_64: "" # Empty tags are ignored by gitlab
FDO_RUNNER_JOB_PRIORITY_TAG_X86_64_KVM: kvm
FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64: aarch64
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

@@ -432,7 +432,7 @@
tags:
- farm:$RUNNER_FARM_LOCATION
- $B2C_MARS_SETUP_TAGS
- $VALVE_INFRA_VANGOGH_JOB_PRIORITY
- $CI_TRON_JOB_PRIORITY_TAG
.raphael-test-valve:
variables:

View File

@@ -237,7 +237,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