Module: Mesa Branch: main Commit: 938465ccac0b61cf97e49eec923e18ab10c8885f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=938465ccac0b61cf97e49eec923e18ab10c8885f
Author: David Heidelberg <[email protected]> Date: Wed Aug 30 22:06:35 2023 +0200 ci/farms: no need to check RUNNER_TAG for Collabora farm Since Google Freedreno and Collabora farm definition split, we don't need to check for runner tag. Reported-by: Eric Engestrom <[email protected]> Signed-off-by: David Heidelberg <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24961> --- .gitlab-ci/farm-rules.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci/farm-rules.yml b/.gitlab-ci/farm-rules.yml index 0f7cfae0eb9..6e2695af68c 100644 --- a/.gitlab-ci/farm-rules.yml +++ b/.gitlab-ci/farm-rules.yml @@ -79,22 +79,20 @@ .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]
