diff --git a/.gitlab/issue_templates/Feature Flag Roll Out.md b/.gitlab/issue_templates/Feature Flag Roll Out.md
index 3bd39a739040170403221b0b04b1760a8ca6e4ec..aad6c931915b2cab93b46bcfc101cace78aaccad 100644
--- a/.gitlab/issue_templates/Feature Flag Roll Out.md
+++ b/.gitlab/issue_templates/Feature Flag Roll Out.md
@@ -41,7 +41,7 @@ Note: Please make sure to run the chatops commands in the Slack channel that get
as this is the first environment deployed to. Make sure you are [configured to use canary](https://next.gitlab.com/).
- [ ] If the feature flag causes end-to-end tests to fail, disable the feature flag on staging to avoid blocking [deployments](https://about.gitlab.com/handbook/engineering/deployments-and-releases/deployments/).
-For assistance with end-to-end test failures, please reach out via the [`#quality` Slack channel](https://gitlab.slack.com/archives/C3JJET4Q6). Note that end-to-end test failures on `staging-ref` [don't block deployments](https://about.gitlab.com/handbook/engineering/infrastructure/environments/staging-ref/#how-to-use-staging-ref).
+For assistance with end-to-end test failures, please reach out via the [`#test-platform` Slack channel](https://gitlab.slack.com/archives/C3JJET4Q6). Note that end-to-end test failures on `staging-ref` [don't block deployments](https://about.gitlab.com/handbook/engineering/infrastructure/environments/staging-ref/#how-to-use-staging-ref).
### Specific rollout on production
diff --git a/danger/stable_branch_patch/Dangerfile b/danger/stable_branch_patch/Dangerfile
index a4b557c1eaaa40b792ab8798f9dd1e9244d3efe3..e5635f3ae266a8d0abfa8f0812c30c19098753c5 100644
--- a/danger/stable_branch_patch/Dangerfile
+++ b/danger/stable_branch_patch/Dangerfile
@@ -7,7 +7,7 @@ if stable_branch.encourage_package_and_qa_execution?
**@#{helper.mr_author}, the `package-and-test` job must complete before merging this merge request.***
If there are failures on the `package-and-test` pipeline, 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.
+ the failures are unrelated to the merge request. If there's no SET assigned, ask for assistance on the `#test-platform` Slack channel.
MARKDOWN
end
diff --git a/doc/development/testing_guide/end_to_end/index.md b/doc/development/testing_guide/end_to_end/index.md
index 47bf29d4d88f3a65db3eef7cfd3e6851c2eaaa41..4b7e4f06477ddeb5d9f1ed407a2ee1d28b9f6f2e 100644
--- a/doc/development/testing_guide/end_to_end/index.md
+++ b/doc/development/testing_guide/end_to_end/index.md
@@ -302,7 +302,7 @@ Continued reading:
## Where can you ask for help?
-You can ask question in the `#quality` channel on Slack (GitLab internal) or
+You can ask question in the `#test-platform` channel on Slack (GitLab internal) or
you can find an issue you would like to work on in
[the `gitlab` issue tracker](https://gitlab.com/gitlab-org/gitlab/-/issues?label_name%5B%5D=QA&label_name%5B%5D=test), or
[the `gitlab-qa` issue tracker](https://gitlab.com/gitlab-org/gitlab-qa/-/issues?label_name%5B%5D=new+scenario).
diff --git a/doc/development/testing_guide/end_to_end/page_objects.md b/doc/development/testing_guide/end_to_end/page_objects.md
index afc7f6d5488cb7713fbb4a610e3df94c0efe3301..6e05bb972f8d0044162cdb8abb1ce3cd41dea99c 100644
--- a/doc/development/testing_guide/end_to_end/page_objects.md
+++ b/doc/development/testing_guide/end_to_end/page_objects.md
@@ -303,7 +303,7 @@ from within the `qa` directory.
## Where to ask for help?
-If you need more information, ask for help on `#quality` channel on Slack
+If you need more information, ask for help on `#test-platform` channel on Slack
(internal, GitLab Team only).
If you are not a Team Member, and you still need help to contribute, please
diff --git a/doc/development/testing_guide/end_to_end/resources.md b/doc/development/testing_guide/end_to_end/resources.md
index 2c3d2dda80970289178191cfb969976866eb7e91..2b5d6fcf855aa49434a4216399bb7f0f9b2645be 100644
--- a/doc/development/testing_guide/end_to_end/resources.md
+++ b/doc/development/testing_guide/end_to_end/resources.md
@@ -500,7 +500,7 @@ list.
## Where to ask for help?
-If you need more information, ask for help on `#quality` channel on Slack
+If you need more information, ask for help on `#test-platform` channel on Slack
(internal, GitLab Team only).
If you are not a Team Member, and you still need help to contribute, please
diff --git a/doc/development/testing_guide/review_apps.md b/doc/development/testing_guide/review_apps.md
index 3cbfc1e7fd6d4657f3ff82675da4ed5b1198df83..51ca7e203003b221507bfafc25df47337ab7e770 100644
--- a/doc/development/testing_guide/review_apps.md
+++ b/doc/development/testing_guide/review_apps.md
@@ -212,7 +212,7 @@ subgraph "CNG-mirror pipeline"
your merge request. You can also download the artifacts to see screenshots of
the page at the time the failures occurred. If you don't find the cause of the
failure or if it seems unrelated to your change, please post a message in the
- `#quality` channel and/or create a ~Quality ~"type::bug" issue with a link to your
+ `#test-platform` channel and/or create a ~Quality ~"type::bug" issue with a link to your
merge request.
- The manual `review-stop` can be used to
stop a review app manually, and is also started by GitLab once a merge
diff --git a/qa/qa/scenario/test/sanity/selectors.rb b/qa/qa/scenario/test/sanity/selectors.rb
index 688fede1b2ee4407c47201b938b69e25d73eb2bc..ad84f99128b5909276e38ef8862251b5d860b082 100644
--- a/qa/qa/scenario/test/sanity/selectors.rb
+++ b/qa/qa/scenario/test/sanity/selectors.rb
@@ -36,7 +36,7 @@ def perform(*)
For more help see documentation in
https://docs.gitlab.com/ee/development/testing_guide/end_to_end/page_objects.html
- or ask for help on #quality channel on Slack (GitLab Team only).
+ or ask for help on #test-platform channel on Slack (GitLab Team only).
If you are not a Team Member, and you still need help to
contribute, please open an issue in GitLab QA issue tracker.
diff --git a/scripts/generate-failed-package-and-test-mr-message.rb b/scripts/generate-failed-package-and-test-mr-message.rb
index c57f132d563e4cd6288389a6fee9ad3f2cba9a0a..5db28942291778c0a01bffceabca01dc7c456779 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 @@ def content
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 ccbaba8a3ebf20322857dd9e3b097d16945a8f66..773aa4145d13c91343d4aaaa5e4f00dd6969dc8c 100755
--- a/scripts/generate-message-to-run-e2e-pipeline.rb
+++ b/scripts/generate-message-to-run-e2e-pipeline.rb
@@ -72,8 +72,8 @@ def content
<!-- 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 @@ def content
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
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 aa758e19dfa09320f7b90e5acf7f7a6ff32fe31c..9b19121573984bd08e39719174c670eacec82e3c 100644
--- a/spec/scripts/generate_message_to_run_e2e_pipeline_spec.rb
+++ b/spec/scripts/generate_message_to_run_e2e_pipeline_spec.rb
@@ -224,8 +224,8 @@
<!-- 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.
@@ -235,7 +235,7 @@
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