diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-30 11:49:38 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-30 11:49:38 +0000 |
| commit | 04ce67eb61844e2e01bfdb365194619391ddbc04 (patch) | |
| tree | 26fe5b9e665c13951a3bce6fb6e112f60ffaed95 | |
| parent | 20755ace290946895c0a3e2f4d2f7916069b2a41 (diff) | |
| download | gitlab-ce-04ce67eb61844e2e01bfdb365194619391ddbc04.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-4-stable-ee
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 8b84beba974..baaeb37506b 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -19,6 +19,9 @@ .if-default-branch-refs: &if-default-branch-refs if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH' +.if-stable-branch-refs: &if-stable-branch-refs + if: '$CI_COMMIT_REF_NAME =~ /^[\d-]+-stable(-ee)?$/' + .if-default-branch-push: &if-default-branch-push if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"' @@ -525,6 +528,8 @@ when: never - <<: *if-merge-request-targeting-stable-branch when: never + - <<: *if-stable-branch-refs + when: never - <<: *if-merge-request-labels-as-if-jh - <<: *if-merge-request-labels-run-all-rspec - changes: *code-backstage-qa-patterns @@ -560,6 +565,8 @@ when: never - <<: *if-merge-request-targeting-stable-branch when: never + - <<: *if-stable-branch-refs + when: never - <<: *if-merge-request-labels-as-if-jh - <<: *if-merge-request-labels-run-all-rspec - <<: *if-merge-request @@ -1172,6 +1179,24 @@ - <<: *if-merge-request-labels-as-if-foss changes: *code-backstage-patterns +.rails:rules:as-if-jh-rspec: + rules: + - <<: *if-not-ee + when: never + - <<: *if-jh + when: never + - <<: *if-security-merge-request + when: never + - <<: *if-merge-request-targeting-stable-branch + when: never + - <<: *if-stable-branch-refs + when: never + - <<: *if-merge-request-labels-as-if-jh + allow_failure: true + - <<: *if-merge-request + changes: *ci-patterns + allow_failure: true + .rails:rules:ee-and-foss-db-library-code: rules: - changes: *db-library-patterns @@ -1651,6 +1676,8 @@ when: never - <<: *if-merge-request-targeting-stable-branch when: never + - <<: *if-stable-branch-refs + when: never - <<: *if-merge-request-labels-as-if-jh - <<: *if-merge-request-labels-run-all-rspec - changes: *code-backstage-qa-patterns |