ci/farms: no need to check RUNNER_TAG for Collabora farm
authorDavid Heidelberg <david.heidelberg@collabora.com>
Wed, 30 Aug 2023 20:06:35 +0000 (22:06 +0200)
committerMarge Bot <emma+marge@anholt.net>
Wed, 6 Sep 2023 08:20:30 +0000 (08:20 +0000)
Since Google Freedreno and Collabora farm definition split,
we don't need to check for runner tag.

Reported-by: Eric Engestrom <eric@igalia.com>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24961>

.gitlab-ci/farm-rules.yml

index 0f7cfae..6e2695a 100644 (file)
 
 .collabora-farm-rules:
   rules:
-    - if: '$RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
-      exists: [ .ci-farms-disabled/collabora ]
+    - exists: [ .ci-farms-disabled/collabora ]
       when: never
-    - if: '$RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/ && $CI_PIPELINE_SOURCE != "schedule"'
+    - if: '$CI_PIPELINE_SOURCE != "schedule"'
       changes: [ .ci-farms-disabled/collabora ]
       when: on_success
-    - if: '$RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/ && $CI_PIPELINE_SOURCE != "schedule"'
+    - if: '$CI_PIPELINE_SOURCE != "schedule"'
       changes: [ .ci-farms-disabled/* ]
       when: never
 
 .collabora-farm-manual-rules:
   rules:
-    - if: '$RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
-      exists: [ .ci-farms-disabled/collabora ]
+    - exists: [ .ci-farms-disabled/collabora ]
       when: never
-    - if: '$RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/ && $CI_PIPELINE_SOURCE != "schedule"'
+    - if: '$CI_PIPELINE_SOURCE != "schedule"'
       changes: [ .ci-farms-disabled/collabora ]
       when: never
     - !reference [.collabora-farm-rules, rules]