diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-23 11:22:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-23 11:22:13 +0000 |
| commit | b543e84093a004afc4a23a0971271075e15df682 (patch) | |
| tree | c1364e6ee978552778152341c45f13cc3037de3d | |
| parent | 1ce86e92f81869fc38ece6ae212b5ea9d5ffd405 (diff) | |
| download | gitlab-ce-b543e84093a004afc4a23a0971271075e15df682.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-4-stable-ee
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 8ddcf9c2094..8b84beba974 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -40,6 +40,9 @@ .if-automated-merge-request: &if-automated-merge-request if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/' +.if-merge-request-targeting-stable-branch: &if-merge-request-targeting-stable-branch + if: '$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^[\d-]+-stable(-ee)?$/' + .if-merge-request-labels-as-if-foss: &if-merge-request-labels-as-if-foss if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-as-if-foss/' @@ -518,6 +521,10 @@ when: never - <<: *if-jh when: never + - <<: *if-security-merge-request + when: never + - <<: *if-merge-request-targeting-stable-branch + when: never - <<: *if-merge-request-labels-as-if-jh - <<: *if-merge-request-labels-run-all-rspec - changes: *code-backstage-qa-patterns @@ -550,7 +557,9 @@ - <<: *if-jh when: never - <<: *if-security-merge-request - changes: *code-backstage-patterns + when: never + - <<: *if-merge-request-targeting-stable-branch + when: never - <<: *if-merge-request-labels-as-if-jh - <<: *if-merge-request-labels-run-all-rspec - <<: *if-merge-request @@ -1638,6 +1647,10 @@ when: never - <<: *if-jh when: never + - <<: *if-security-merge-request + when: never + - <<: *if-merge-request-targeting-stable-branch + when: never - <<: *if-merge-request-labels-as-if-jh - <<: *if-merge-request-labels-run-all-rspec - changes: *code-backstage-qa-patterns |