diff options
Diffstat (limited to '.gitlab-ci/farm-rules.yml')
| -rw-r--r-- | .gitlab-ci/farm-rules.yml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab-ci/farm-rules.yml b/.gitlab-ci/farm-rules.yml index 0f6619c9061..0b0562273c0 100644 --- a/.gitlab-ci/farm-rules.yml +++ b/.gitlab-ci/farm-rules.yml @@ -239,11 +239,12 @@ # Skip container & build jobs when disabling any farm -.disable-farm-rules: +# Only apply these rules in MR context, because otherwise we get a false +# positive on files being 'created' when pushing to a new branch, and break +# our pipeline +.disable-farm-mr-rules: rules: # changes(disabled) + exists(disabled) = disabling the farm - # only run in MR context, because otherwise we get a false positive on - # files being 'created' when pushing to a branch, and nuke our pipeline - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: [ .ci-farms-disabled/microsoft ] exists: [ .ci-farms-disabled/microsoft ] |