Re-enable message posted on selective e2e tests detection

.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:

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).
 

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.
 

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.