diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-26 18:10:32 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-26 18:10:32 +0300 |
| commit | 8cd1a72e8f35bf8968ff1cd9b6274b10bfc29346 (patch) | |
| tree | 104770da09e38a2e6b45891cb2e9aee6a6b47dae /.gitlab | |
| parent | ae4756174c3c379caeca8da50ade9675e157ae95 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/review-apps/qa.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/.gitlab/ci/review-apps/qa.gitlab-ci.yml b/.gitlab/ci/review-apps/qa.gitlab-ci.yml index bf013abdd43..a4ca952ea41 100644 --- a/.gitlab/ci/review-apps/qa.gitlab-ci.yml +++ b/.gitlab/ci/review-apps/qa.gitlab-ci.yml @@ -72,7 +72,7 @@ review-qa-reliable: extends: - .review-qa-base - .review:rules:review-qa-reliable - parallel: 8 + parallel: 10 retry: 1 variables: QA_RUN_TYPE: review-qa-reliable diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 142341e5741..01665aa460b 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -247,6 +247,9 @@ .models-patterns: &models-patterns - "{,ee/,jh/}{app/models}/**/*" +.lib-gitlab-patterns: &lib-gitlab-patterns + - "{,ee/,jh/}lib/{,ee/,jh/}gitlab/**/*" + .startup-css-patterns: &startup-css-patterns - "{,ee/,jh/}app/assets/stylesheets/startup/**/*" @@ -604,6 +607,7 @@ rules: - <<: *if-not-ee when: never + - <<: *if-merge-request-targeting-stable-branch - <<: *if-merge-request-labels-run-review-app - <<: *if-dot-com-gitlab-org-and-security-merge-request changes: *ci-build-images-patterns @@ -618,6 +622,7 @@ rules: - <<: *if-not-canonical-namespace when: never + - <<: *if-merge-request-targeting-stable-branch - <<: *if-merge-request-labels-run-review-app - <<: *if-auto-deploy-branches - changes: *ci-build-images-patterns @@ -692,6 +697,7 @@ rules: - <<: *if-not-canonical-namespace when: never + - <<: *if-merge-request-targeting-stable-branch - <<: *if-merge-request-labels-run-review-app - <<: *if-auto-deploy-branches - changes: *code-qa-patterns @@ -882,6 +888,8 @@ - <<: *if-dot-com-gitlab-org-and-security-merge-request changes: *feature-flag-development-config-patterns when: never + - <<: *if-merge-request-targeting-stable-branch + allow_failure: true - <<: *if-dot-com-gitlab-org-and-security-merge-request changes: *nodejs-patterns allow_failure: true @@ -1535,6 +1543,8 @@ - <<: *if-dot-com-gitlab-org-merge-request changes: *models-patterns - <<: *if-dot-com-gitlab-org-merge-request + changes: *lib-gitlab-patterns + - <<: *if-dot-com-gitlab-org-merge-request changes: *qa-patterns - <<: *if-dot-com-gitlab-org-merge-request changes: *code-patterns |