diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-18 21:08:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-18 21:08:42 +0300 |
| commit | 9f2bc6fc4c27d0703260352c79463fbc62555ac8 (patch) | |
| tree | b65188898a054771df56298e4737837e999c8866 /.gitlab | |
| parent | b6b9abb7cdb61f18d6fc5222e52486d7f6c482dc (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 704c857760d..2d23ce53c52 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -1306,7 +1306,7 @@ allow_failure: true - <<: *if-ruby2-branch -.qa:rules:package-and-test-mrs: +.qa:rules:package-and-test-common: rules: - <<: *if-not-canonical-namespace when: never @@ -1352,6 +1352,10 @@ - <<: *if-dot-com-gitlab-org-and-security-merge-request-and-qa-tests-specified changes: *code-patterns allow_failure: true + +.qa:rules:package-and-test-mrs: + rules: + - !reference [".qa:rules:package-and-test-common", rules] - <<: *if-merge-request changes: *code-patterns when: manual @@ -1394,7 +1398,13 @@ rules: - if: '$QA_RUN_TESTS_ON_GDK !~ /true|yes|1/i' when: never - - !reference [".qa:rules:package-and-test-ee", rules] + - !reference [".qa:rules:package-and-test-common", rules] + - <<: *if-merge-request + changes: *code-patterns + allow_failure: true + - <<: *if-force-ci + when: manual + allow_failure: true ############### # Rails rules # |