Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 4 deletions

diff --git a/scripts/generate-failed-package-and-test-mr-message.rb b/scripts/generate-failed-package-and-test-mr-message.rb
index c57f132d563..5db28942291 100755
--- a/scripts/generate-failed-package-and-test-mr-message.rb
+++ b/scripts/generate-failed-package-and-test-mr-message.rb
@@ -54,7 +54,7 @@ class GenerateFailedPackageAndTestMrMessage
     investigated to guarantee this backport complies with the Quality standards.
 
     Ping your team's associated Software Engineer in Test (SET) to confirm the failures are unrelated to the merge request.
-    If there's no SET assigned, ask for assistance on the `#quality` Slack channel.
+    If there's no SET assigned, ask for assistance on the `#test-platform` Slack channel.
     MARKDOWN
   end
 
diff --git a/scripts/generate-message-to-run-e2e-pipeline.rb b/scripts/generate-message-to-run-e2e-pipeline.rb
index ccbaba8a3eb..773aa4145d1 100755
--- a/scripts/generate-message-to-run-e2e-pipeline.rb
+++ b/scripts/generate-message-to-run-e2e-pipeline.rb
@@ -72,8 +72,8 @@ class GenerateMessageToRunE2ePipeline
       <!-- Run e2e warning begin -->
       @#{author_username} Some end-to-end (E2E) tests should run based on the stage label.
 
-      Please start the `trigger-omnibus-and-follow-up-e2e` job in the `qa` stage and ensure tests in the `follow-up-e2e:package-and-test-ee` pipeline
-      pass **before this MR is merged**.
+      Please start the `trigger-omnibus-and-follow-up-e2e` job in the `qa` stage and wait for the tests in the `follow-up-e2e:package-and-test-ee` pipeline
+      to pass **before merging this MR**. Do not use **Auto-merge**, unless these tests have already completed successfully, because a failure in these tests do not block the auto-merge.
       (E2E tests are computationally intensive and don't run automatically for every push/rebase, so we ask you to run this job manually at least once.)
 
       To run all E2E tests, apply the ~"pipeline:run-all-e2e" label and run a new pipeline.
@@ -83,7 +83,7 @@ class GenerateMessageToRunE2ePipeline
 
       Once done, apply the ✅ emoji on this comment.
 
-      **Team members only:** for any questions or help, reach out on the internal `#quality` Slack channel.
+      **Team members only:** for any questions or help, reach out on the internal `#test-platform` Slack channel.
       <!-- Run e2e warning end -->
     MARKDOWN
   end