diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-27 03:09:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-27 03:09:33 +0300 |
| commit | 760a58cc78d5646d957bf10d8e86d940d423dfbe (patch) | |
| tree | ca34030f1d7ee4a4081540e29849e976e9015bc5 /.gitlab | |
| parent | f57bd3d34851023628f4b2f3402720f8f404641f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 46 |
2 files changed, 47 insertions, 1 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index 9ece789eb2a..092b3c0695f 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -152,7 +152,7 @@ follow-up-e2e:package-and-test-ee: e2e:post-run-e2e-message: extends: - .predictive-job - - .qa:rules:determine-e2e-tests + - .qa:rules:post-run-e2e-message stage: qa variables: ENV_FILE: $CI_PROJECT_DIR/qa_tests_vars.env diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index af10b21bd9c..c63a90402a7 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -1613,6 +1613,7 @@ # 1) .qa:rules:manual-omnibus-and-follow-up-e2e # 2) .qa:rules:follow-up-e2e # 3) .qa:rules:trigger-omnibus-env +# 4) .qa:rules:post-run-e2e-message .qa:rules:package-and-test-ee: rules: - !reference [".qa:rules:package-and-test-common", rules] @@ -1770,6 +1771,51 @@ - <<: *if-force-ci allow_failure: true +# These are based on `qa:rules:package-and-test-ee` but with when:never in all except for code-patterns in merge requests +.qa:rules:post-run-e2e-message: + rules: + # From .qa:rules:package-and-test-common + - !reference [".qa:rules:package-and-test-never-run", rules] + - <<: *if-merge-request-targeting-stable-branch + changes: *setup-test-env-patterns + when: never + - <<: *if-ruby3_1-branch + when: never + - <<: *if-merge-request + changes: *dependency-patterns + when: never + - <<: *if-merge-request-labels-run-all-e2e + when: never + - <<: *if-dot-com-gitlab-org-and-security-merge-request-manual-ff-package-and-e2e + changes: *feature-flag-development-config-patterns + when: never + - <<: *if-merge-request + changes: *feature-flag-development-config-patterns + when: never + - <<: *if-merge-request + changes: *initializers-patterns + when: never + - <<: *if-merge-request + changes: *nodejs-patterns + when: never + - <<: *if-merge-request + changes: *ci-qa-patterns + when: never + - <<: *if-merge-request + changes: *qa-patterns + when: never + - <<: *if-dot-com-gitlab-org-and-security-merge-request-and-qa-tests-specified + changes: *code-patterns + when: never + - <<: *if-force-ci + when: never + # From .qa:rules:package-and-test-schedule + - <<: *if-dot-com-gitlab-org-schedule + when: never + # From .qa:rules:code-merge-request-manual + - <<: *if-merge-request + changes: *code-patterns + allow_failure: true ############### # Rails rules # |