ci: use $CI_TRON_JOB_PRIORITY tag on all ci-tron jobs

Moving `ci-tron:priority:` out of the variable because an empty value
will not be authorized, and this makes it obvious if that bug ever
happens (job will not be picked up and gitlab will complain that
`ci-tron:priority:` is not a tag registered by any runner), instead of
getting picked up by any runner that will then reject (fail) the job.

(This is caused by GitLab's API not allowing tags to be enforced when
picking up jobs, resulting in jobs with missing tags being picked up by
any runner, like the bug we had with the generic fd.o runners a few
months ago.)

v2 (Martin Roukala):
 * use the priority tags in all amdgpu jobs
 * add missing tags in etnaviv jobs
 * add missing tags in broadcom jobs

Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37897>

.gitlab-ci.yml

@@ -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
-        CI_TRON_JOB_PRIORITY_TAG: ""  # Empty tags are ignored by gitlab
+        CI_TRON_JOB_PRIORITY: high
         JOB_PRIORITY: 75
         # fast-fail in merge pipelines: stop early if we get this many unexpected fails/crashes
         DEQP_RUNNER_MAX_FAILS: 40
@@ -61,6 +61,7 @@ workflow:
         FDO_RUNNER_JOB_PRIORITY_TAG_X86_64: priority:low
         FDO_RUNNER_JOB_PRIORITY_TAG_X86_64_KVM: priority:low-kvm
         FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64: priority:low-aarch64
+        CI_TRON_JOB_PRIORITY: low
         JOB_PRIORITY: 45
         # (some) nightly builds perform LTO, so they take much longer than the
         # short timeout allowed in other pipelines.
@@ -123,7 +124,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
-  CI_TRON_JOB_PRIORITY_TAG: ci-tron:priority:low
+  CI_TRON_JOB_PRIORITY: default
   JOB_PRIORITY: 50
   DATA_STORAGE_PATH: data_storage
   KERNEL_IMAGE_BASE: "https://$S3_HOST/$S3_KERNEL_BUCKET/$KERNEL_REPO/$KERNEL_TAG"
@@ -422,4 +423,3 @@ sanity:
     when: on_failure
     reports:
       junit: check-*.xml
-

.gitlab-ci/ci-tron/gitlab-ci.yml

@@ -40,6 +40,7 @@
     - !reference [.required-for-hardware-jobs, needs]
   tags:
     - farm:$RUNNER_FARM_LOCATION
+    - ci-tron:priority:$CI_TRON_JOB_PRIORITY
     - $CI_TRON_DUT_SETUP_TAGS
 
   # Override the default before_script, as it is not compatible with the CI-tron environment. We just keep the clearing

src/amd/ci/gitlab-ci-inc.yml

@@ -356,6 +356,7 @@
     - farm:$RUNNER_FARM_LOCATION
     - $CI_TRON_DUT_SETUP_TAGS
     - amdgpu:$INTEGRATED_OR_DISCRETE
+    - ci-tron:priority:$CI_TRON_JOB_PRIORITY
 
 .ci-tron-test-radv:
   extends: .ci-tron-test-amdgpu
@@ -484,11 +485,6 @@
     INTEGRATED_OR_DISCRETE: integrated
     GPU_VERSION: radv-vangogh
     FDO_CI_CONCURRENT: 8
-  tags:
-    - farm:$RUNNER_FARM_LOCATION
-    - amdgpu:$INTEGRATED_OR_DISCRETE
-    - $CI_TRON_DUT_SETUP_TAGS
-    - $CI_TRON_JOB_PRIORITY_TAG
 
 .raphael-test-valve:
   variables:

src/broadcom/ci/gitlab-ci-inc.yml

@@ -228,6 +228,7 @@
   tags:
     - farm:igalia
     - dt_gpu:model:$RPI_MODEL
+    - ci-tron:priority:$CI_TRON_JOB_PRIORITY
 
 
 # For RPI_KERNEL, see KERNEL in

src/etnaviv/ci/gitlab-ci-inc.yml

@@ -58,6 +58,7 @@
     FDO_CI_CONCURRENT: 2
   tags:
     - farm:$RUNNER_FARM_LOCATION
+    - ci-tron:priority:$CI_TRON_JOB_PRIORITY
     - cpu:cores:2
     - $VIVANTE_MODEL_TAG
     - $VIVANTE_REVISION_TAG
@@ -70,6 +71,7 @@
     FDO_CI_CONCURRENT: 4
   tags:
     - farm:$RUNNER_FARM_LOCATION
+    - ci-tron:priority:$CI_TRON_JOB_PRIORITY
     - cpu:cores:4
     - $VIVANTE_MODEL_TAG
     - $VIVANTE_REVISION_TAG
@@ -86,6 +88,7 @@
     GPU_VERSION: "etnaviv-gc3000-r5450"
   tags:
     - farm:$RUNNER_FARM_LOCATION
+    - ci-tron:priority:$CI_TRON_JOB_PRIORITY
     - $VIVANTE_MODEL_TAG
     - $VIVANTE_REVISION_TAG
 
@@ -101,6 +104,7 @@
     GPU_VERSION: "etnaviv-gc7000-r6214"
   tags:
     - farm:$RUNNER_FARM_LOCATION
+    - ci-tron:priority:$CI_TRON_JOB_PRIORITY
     - $VIVANTE_MODEL_TAG
     - $VIVANTE_REVISION_TAG
 
@@ -115,4 +119,3 @@
     BOOT_METHOD: barebox
     RUNNER_TAG: mesa-ci-x86-64-lava-imx8mp-tqma8mpql-mba8mpxl
     VISIBILITY_GROUP: "mesa-ci"
-

src/gallium/drivers/zink/ci/gitlab-ci.yml

@@ -285,10 +285,6 @@ zink-radv-vangogh-valve:
     CI_TRON_TIMEOUT__OVERALL__MINUTES: 30
     FDO_CI_CONCURRENT: 6
     RADV_PERFTEST: hic
-  # Override the list of tags to drop `ci-tron:priority:low`
-  tags:
-    - farm:$RUNNER_FARM_LOCATION
-    - amdgpu:codename:VANGOGH
 
 zink-radv-vangogh-traces:
   extends: