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"'