diff --git a/.gitlab/ci/setup.gitlab-ci.yml b/.gitlab/ci/setup.gitlab-ci.yml index b652ac5e30be6eab8118f0a2d2dd5a8ddfce608c..196a1eb341fcb721dfb4a6fde39883676a0a190b 100644 --- a/.gitlab/ci/setup.gitlab-ci.yml +++ b/.gitlab/ci/setup.gitlab-ci.yml @@ -167,6 +167,9 @@ e2e-test-pipeline-generate: script: - bundle exec rake "ci:detect_changes[$ENV_FILE]" - cd $CI_PROJECT_DIR && scripts/generate-e2e-pipeline + - source scripts/utils.sh + - install_gitlab_gem + - scripts/generate-message-to-run-e2e-pipeline.rb artifacts: expire_in: 1 day paths: diff --git a/danger/qa_selector/Dangerfile b/danger/qa_selector/Dangerfile index f049915dc427f1f7be64773957ea31930f4c2534..d7eb6819d973496c19b648726a4aa33d2b433d86 100644 --- a/danger/qa_selector/Dangerfile +++ b/danger/qa_selector/Dangerfile @@ -38,7 +38,8 @@ if lines_with_qa_selectors.any? * #{lines_with_qa_selectors.join("\n* ")} - Please ensure `e2e:package-and-test` job is run and the tests are passing. + If the `e2e:package-and-test` job in the `qa` stage has run automatically, please ensure the tests are passing. + If the job has not run, please start the `trigger-omnibus-and-follow-up-e2e` job in the `qa` stage and ensure the tests in `follow-up-e2e:package-and-test-ee` pipeline are passing. For the list of known failures please refer to [the latest pipeline triage issue](https://gitlab.com/gitlab-org/quality/pipeline-triage/-/issues). diff --git a/scripts/generate-message-to-run-e2e-pipeline.rb b/scripts/generate-message-to-run-e2e-pipeline.rb index af18578add62e070067bd1dc32b2fb0f6ca75d3d..0a0b7b3795b8addd297bc221011e7f91cde45baa 100755 --- a/scripts/generate-message-to-run-e2e-pipeline.rb +++ b/scripts/generate-message-to-run-e2e-pipeline.rb @@ -71,10 +71,13 @@ def content <<~MARKDOWN <!-- Run e2e warning begin --> :warning: @#{author_username} Some end-to-end (E2E) tests have been selected based on the stage label on this MR. - If not run already, please run the `e2e:package-and-test-ee` job in the `qa` stage - and review the results **before merging this MR**. (E2E tests are not run automatically on some MRs due to [runner resource constraints](https://gitlab.com/gitlab-org/gitlab-qa/-/issues/261).) - If you would like to run all e2e tests, please apply the ~"pipeline:run-all-e2e" label and restart the pipeline. + Please start the `trigger-omnibus-and-follow-up-e2e` job in the `qa` stage and ensure the tests in `follow-up-e2e:package-and-test-ee` pipeline + are passing **before this MR is merged**. + + If you would like to run all e2e tests, please apply the ~"pipeline:run-all-e2e" label and trigger a new pipeline. This will run all tests in `e2e:package-and-test` pipeline. + + For the list of known failures please refer to [the latest pipeline triage issue](https://gitlab.com/gitlab-org/quality/pipeline-triage/-/issues). Once done, please apply the ✅ emoji on this comment. diff --git a/spec/scripts/generate_message_to_run_e2e_pipeline_spec.rb b/spec/scripts/generate_message_to_run_e2e_pipeline_spec.rb index 61307937101f2c055e3d6fa0f8335cc5b88582dc..b1e2d5932ba4f5ceff3519900aa093221866f37b 100644 --- a/spec/scripts/generate_message_to_run_e2e_pipeline_spec.rb +++ b/spec/scripts/generate_message_to_run_e2e_pipeline_spec.rb @@ -223,10 +223,13 @@ <<~MARKDOWN <!-- Run e2e warning begin --> :warning: @#{author_username} Some end-to-end (E2E) tests have been selected based on the stage label on this MR. - If not run already, please run the `e2e:package-and-test-ee` job in the `qa` stage - and review the results **before merging this MR**. (E2E tests are not run automatically on some MRs due to [runner resource constraints](https://gitlab.com/gitlab-org/gitlab-qa/-/issues/261).) - If you would like to run all e2e tests, please apply the ~"pipeline:run-all-e2e" label and restart the pipeline. + Please start the `trigger-omnibus-and-follow-up-e2e` job in the `qa` stage and ensure the tests in `follow-up-e2e:package-and-test-ee` pipeline + are passing **before this MR is merged**. + + If you would like to run all e2e tests, please apply the ~"pipeline:run-all-e2e" label and trigger a new pipeline. This will run all tests in `e2e:package-and-test` pipeline. + + For the list of known failures please refer to [the latest pipeline triage issue](https://gitlab.com/gitlab-org/quality/pipeline-triage/-/issues). Once done, please apply the ✅ emoji on this comment.