From 55ac1bfc57fcdf437372e505ab27a0b38db18674 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 2 Apr 2024 07:48:33 +0100 Subject: [PATCH] ci: add missing rule to disable vmware farm Fixes: 54050d88441b9c2a3956 ("svga/ci: land vmware mesa-ci lava farm") Part-of: --- .gitlab-ci/farm-rules.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci/farm-rules.yml b/.gitlab-ci/farm-rules.yml index 02eafb28b20..eaddaa9fbd1 100644 --- a/.gitlab-ci/farm-rules.yml +++ b/.gitlab-ci/farm-rules.yml @@ -330,6 +330,10 @@ changes: [ .ci-farms-disabled/ondracka ] exists: [ .ci-farms-disabled/ondracka ] when: never + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + changes: [ .ci-farms-disabled/vmware ] + exists: [ .ci-farms-disabled/vmware ] + when: never # Any other change to ci-farms/* means some farm is getting re-enabled. # Run jobs in Marge pipelines (and let it fallback to manual otherwise) - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "marge-bot"'