From 7ab7f0bd00fc331dd43fa81da9a5139369fea437 Mon Sep 17 00:00:00 2001
From: sabril <5334504+saturninoabril@users.noreply.github.com>
Date: Wed, 15 Apr 2026 21:38:49 +0800
Subject: [PATCH] SEC-10095 test(cypress): demote unstable tests (#36099)

* test(cypress): demote unstable tests

* follow fixes

* fix merging playwright reports
---
 .../workflows/e2e-tests-playwright-template.yml   | 12 ++----------
 e2e-tests/.ci/.e2erc                              |  2 +-
 e2e-tests/.ci/report.publish.sh                   | 15 +++++++++------
 e2e-tests/.ci/server.generate.sh                  |  3 ++-
 e2e-tests/.ci/server.run_playwright.sh            |  2 +-
 .../accessibility_keyboard_usability_spec.js      |  1 -
 .../accessibility_nav_diff_regions_spec.js        |  1 -
 .../account_settings/profile/email_spec.ts        |  1 -
 .../profile/help_text_link_spec.ts                |  1 -
 .../archived_channel/archive_channel_post_spec.ts |  1 -
 .../join_archived_channel_spec.ts                 |  1 -
 .../channels/auth_sso/authentication_4_spec.ts    |  1 -
 .../channels/benchmark/message_spec.ts            |  1 -
 .../open_rhs_coming_from_system_console_spec.ts   |  1 -
 .../dm_gm_filtering_sorting_spec.ts               |  1 -
 .../channel_sidebar/unread_filter_spec.ts         |  1 -
 .../global_threads_spec.ts                        |  1 -
 .../custom_status/custom_status_1_spec.ts         |  1 -
 .../custom_status/custom_status_2_spec.ts         |  1 -
 .../extend_session/session_length_spec.ts         |  1 -
 .../guest_accounts/guest_removal_ui_spec.ts       |  1 -
 .../enterprise/ldap/ldap_group_sync_spec.ts       |  1 -
 .../channels/enterprise/ldap/ldap_guest_spec.ts   |  1 -
 .../enterprise/ldap_group/channel_modes_spec.ts   |  1 -
 .../profile_popover/profile_popover_spec.ts       |  1 -
 .../about/edition_and_license_spec.js             |  1 -
 .../system_console/authentication_method_spec.js  |  1 -
 .../system_console/channel_members_spec.js        |  1 -
 .../reporting/site_statistics_spec.js             |  1 -
 .../sidebar_link_navigation_e20_spec.js           |  1 -
 .../system_scheme_permission_spec.js              |  1 -
 .../system_console/team_members_spec.js           |  1 -
 .../system_console/team_scheme_permission_spec.js |  1 -
 .../image_link_preview_spec.js                    |  1 -
 .../builtin_commands/invalid_commands_spec.js     |  1 -
 .../incoming_webhook/basic_formatting_spec.js     |  1 -
 .../delete_incoming_webhook_spec.js               |  1 -
 .../inapp_username_profile_override_spec.js       |  1 -
 .../long_url_embedded_image_spec.js               |  1 -
 .../integrations/incoming_webhook/setting_spec.js |  1 -
 .../integrations_search_gives_feedback_spec.js    |  1 -
 .../channels/integrations/integrations_spec.js    |  1 -
 .../outgoing_webhook/prompt_set_status_spec.js    |  1 -
 .../slack_parsing_message_button_spec.js          |  1 -
 .../ctrl_cmd_k_focuses_message_box_spec.js        |  1 -
 .../keyboard_shortcuts_2_spec.js                  |  1 -
 .../channels/markdown/markdown_text_spec.js       |  1 -
 .../messaging/channel_and_posts_links_spec.js     |  1 -
 .../channel_read_after_permalink_spec.js          |  1 -
 .../emoji_followed_by_punctuation_spec.js         |  1 -
 .../messaging/emoji_insert_position_spec.js       |  1 -
 .../channels/messaging/emoji_size_spec.js         |  1 -
 .../channels/messaging/emoji_skin_tone_spec.js    |  1 -
 .../channels/messaging/emoji_to_markdown_spec.js  |  1 -
 .../file_upload_in_center_channel_spec.js         |  1 -
 .../channels/messaging/image_attachment_spec.js   |  1 -
 .../channels/messaging/message_bullets_spec.js    |  1 -
 .../messaging/message_channel_draw_spec.js        |  1 -
 .../channels/messaging/message_parse_spec.js      |  1 -
 .../channels/messaging/message_permalink_spec.js  |  1 -
 .../messaging/message_pinning_unpinning_spec.js   |  1 -
 .../messaging/message_reply_scrollable_spec.js    |  1 -
 .../messaging/message_shortlinking_spec.js        |  1 -
 .../channels/messaging/permalink_click_spec.js    |  1 -
 .../channels/messaging/pinned_posts_1_spec.js     |  1 -
 ...ooltips_on_top_nav_channel_icons_posts_spec.js |  1 -
 .../channel_links_show_as_links_spec.js           |  1 -
 .../channels/plugins/plugin_buttons_spec.js       |  1 -
 .../channels/scroll/channel_scroll_spec.js        |  1 -
 .../channels/scroll/fixed_width_spec.js           |  1 -
 .../search/post_search_display_not_cloud_spec.js  |  1 -
 .../settings/display/clock_display_mode_spec.js   |  1 -
 .../channels/signin_authentication/signup_spec.js |  1 -
 .../announcement_banner_spec.js                   |  1 -
 .../site_configuration/customization_spec.js      |  1 -
 .../system_console/user_management_spec.js        |  1 -
 .../invite_user_to_closed_team_spec.js            |  1 -
 .../trigger_browser_notification_spec.ts          |  1 -
 .../channels/toast/permalink_post_spec.js         |  1 -
 .../toast/permalink_post_with_new_message_spec.js |  1 -
 e2e-tests/playwright/playwright.config.ts         |  1 +
 .../channel_banner/channel_banner.spec.ts         |  4 ++--
 .../system_console/mobile_security.spec.ts        |  7 +++++--
 83 files changed, 23 insertions(+), 98 deletions(-)

diff --git a/.github/workflows/e2e-tests-playwright-template.yml b/.github/workflows/e2e-tests-playwright-template.yml
index 540abbf55e..ed064758a0 100644
--- a/.github/workflows/e2e-tests-playwright-template.yml
+++ b/.github/workflows/e2e-tests-playwright-template.yml
@@ -228,16 +228,8 @@ jobs:
           mkdir -p results/reporter
 
           # Merge blob reports using Playwright merge-reports (per docs)
-          # Pin version to match the one used to generate blob reports (avoids format mismatch)
-          PW_VERSION=$(node -e "const p=require('./package.json');process.stdout.write(p.dependencies?.['@playwright/test']||p.devDependencies?.['@playwright/test']||'')")
-          npm install --no-save @playwright/test@${PW_VERSION}
-          npx playwright merge-reports --config merge.config.mjs ./shard-results/results/blob-report/ || true
-
-          # If merge-reports produced no results.json (no blob reports), fall back to
-          # the json reporter output written directly by the test shard
-          if [ ! -f results/reporter/results.json ] && [ -f shard-results/results/reporter/results.json ]; then
-            cp shard-results/results/reporter/results.json results/reporter/results.json
-          fi
+          npm install --no-save @playwright/test
+          npx playwright merge-reports --config merge.config.mjs ./shard-results/results/blob-report/
       - name: ci/calculate
         id: calculate
         uses: ./.github/actions/calculate-playwright-results
diff --git a/e2e-tests/.ci/.e2erc b/e2e-tests/.ci/.e2erc
index 60dc5937eb..bc9beecb06 100644
--- a/e2e-tests/.ci/.e2erc
+++ b/e2e-tests/.ci/.e2erc
@@ -58,7 +58,7 @@ mme2e_wait_image () {
   IMAGE_NAME=${1?}
   RETRIES_LEFT=${2:-1}
   RETRIES_INTERVAL=${3:-10}
-  mme2e_wait_command_success "docker pull $IMAGE_NAME" "Waiting for docker image ${IMAGE_NAME} to be available" "$RETRIES_LEFT" "$RETRIES_INTERVAL"
+  mme2e_wait_command_success "docker pull --platform linux/amd64 $IMAGE_NAME" "Waiting for docker image ${IMAGE_NAME} to be available" "$RETRIES_LEFT" "$RETRIES_INTERVAL"
 }
 mme2e_is_token_in_list() {
   local TOKEN=$1
diff --git a/e2e-tests/.ci/report.publish.sh b/e2e-tests/.ci/report.publish.sh
index 18d0db5c61..169ba67031 100755
--- a/e2e-tests/.ci/report.publish.sh
+++ b/e2e-tests/.ci/report.publish.sh
@@ -14,13 +14,16 @@ cd "$(dirname "$0")"
 : ${WEBHOOK_URL:-}      # Optional. Mattermost webhook to post the report back to
 : ${RELEASE_DATE:-}     # Optional. If set, its value will be included in the report as the release date of the tested artifact
 if [ "$TYPE" = "PR" ]; then
-  # In this case, we expect the PR number to be present in the BRANCH variable
-  BRANCH_REGEX='^server-pr-[0-9]+$'
-  if ! grep -qE "${BRANCH_REGEX}" <<<"$BRANCH"; then
-    mme2e_log "Error: when using TYPE=PR, the BRANCH variable should respect regex '$BRANCH_REGEX'. Aborting." >&2
-    exit 1
+  # Try to determine PR number: first from PR_NUMBER, then from BRANCH (server-pr-XXXX format)
+  if [ -n "${PR_NUMBER:-}" ]; then
+    export PULL_REQUEST="https://github.com/mattermost/mattermost/pull/${PR_NUMBER}"
+  elif grep -qE '^server-pr-[0-9]+$' <<<"${BRANCH:-}"; then
+    PR_NUMBER="${BRANCH##*-}"
+    export PULL_REQUEST="https://github.com/mattermost/mattermost/pull/${PR_NUMBER}"
+  else
+    mme2e_log "Warning: TYPE=PR but cannot determine PR number from PR_NUMBER or BRANCH. Falling back to TYPE=NONE."
+    TYPE=NONE
   fi
-  export PULL_REQUEST="https://github.com/mattermost/mattermost/pull/${BRANCH##*-}"
 fi
 
 # Env vars used during the test. Their values will be included in the report
diff --git a/e2e-tests/.ci/server.generate.sh b/e2e-tests/.ci/server.generate.sh
index 4cde16aaf9..0ed26a84c7 100755
--- a/e2e-tests/.ci/server.generate.sh
+++ b/e2e-tests/.ci/server.generate.sh
@@ -48,6 +48,7 @@ generate_docker_compose_file() {
 services:
   server:
     image: \${SERVER_IMAGE}
+    platform: linux/amd64
     restart: always
     env_file:
       - "./.env.server"
@@ -81,7 +82,7 @@ $(for service in $ENABLED_DOCKER_SERVICES; do
 $(if mme2e_is_token_in_list "postgres" "$ENABLED_DOCKER_SERVICES"; then
     echo '
   postgres:
-    image: mattermostdevelopment/mirrored-postgres:13
+    image: mattermostdevelopment/mirrored-postgres:14
     restart: "no"
     network_mode: host
     networks: !reset []
diff --git a/e2e-tests/.ci/server.run_playwright.sh b/e2e-tests/.ci/server.run_playwright.sh
index a0862bd975..19ba8bca02 100755
--- a/e2e-tests/.ci/server.run_playwright.sh
+++ b/e2e-tests/.ci/server.run_playwright.sh
@@ -37,7 +37,7 @@ EOF
 
 # Run Playwright test
 # NB: do not exit the script if some testcases fail
-${MME2E_DC_SERVER} exec -i -u "$MME2E_UID" -- playwright bash -c "cd e2e-tests/playwright && npm run test:ci -- ${TEST_FILTER}" | tee ../playwright/logs/playwright.log || true
+${MME2E_DC_SERVER} exec -i -u "$MME2E_UID" -- playwright bash -c "cd e2e-tests/playwright && npm run test:ci -- ${TEST_FILTER} ${PW_SHARD:-}" | tee ../playwright/logs/playwright.log || true
 
 # Collect run results
 # Documentation on the results.json file: https://playwright.dev/docs/api/class-testcase#test-case-expected-status
diff --git a/e2e-tests/cypress/tests/integration/channels/accessibility/accessibility_keyboard_usability_spec.js b/e2e-tests/cypress/tests/integration/channels/accessibility/accessibility_keyboard_usability_spec.js
index 22383c6af3..8a05eec7af 100644
--- a/e2e-tests/cypress/tests/integration/channels/accessibility/accessibility_keyboard_usability_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/accessibility/accessibility_keyboard_usability_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @accessibility
 
 import {getRandomId} from '../../../utils';
diff --git a/e2e-tests/cypress/tests/integration/channels/accessibility/accessibility_nav_diff_regions_spec.js b/e2e-tests/cypress/tests/integration/channels/accessibility/accessibility_nav_diff_regions_spec.js
index 55de4a1500..511c5fdd42 100644
--- a/e2e-tests/cypress/tests/integration/channels/accessibility/accessibility_nav_diff_regions_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/accessibility/accessibility_nav_diff_regions_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @accessibility
 
 import {getRandomId} from '../../../utils';
diff --git a/e2e-tests/cypress/tests/integration/channels/account_settings/profile/email_spec.ts b/e2e-tests/cypress/tests/integration/channels/account_settings/profile/email_spec.ts
index 4339ae4975..788729b221 100644
--- a/e2e-tests/cypress/tests/integration/channels/account_settings/profile/email_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/account_settings/profile/email_spec.ts
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @account_setting
 
 import * as TIMEOUTS from '../../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/account_settings/profile/help_text_link_spec.ts b/e2e-tests/cypress/tests/integration/channels/account_settings/profile/help_text_link_spec.ts
index fbea02d9ca..7d84967b35 100644
--- a/e2e-tests/cypress/tests/integration/channels/account_settings/profile/help_text_link_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/account_settings/profile/help_text_link_spec.ts
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @account_setting
 
 describe('Account Settings', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/archived_channel/archive_channel_post_spec.ts b/e2e-tests/cypress/tests/integration/channels/archived_channel/archive_channel_post_spec.ts
index cdd2a16c41..39634cbe71 100644
--- a/e2e-tests/cypress/tests/integration/channels/archived_channel/archive_channel_post_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/archived_channel/archive_channel_post_spec.ts
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @channel
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/archived_channel/join_archived_channel_spec.ts b/e2e-tests/cypress/tests/integration/channels/archived_channel/join_archived_channel_spec.ts
index e4dd367d1a..9a40a1602a 100644
--- a/e2e-tests/cypress/tests/integration/channels/archived_channel/join_archived_channel_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/archived_channel/join_archived_channel_spec.ts
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @channel
 
 import {getAdminAccount} from '../../../support/env';
diff --git a/e2e-tests/cypress/tests/integration/channels/auth_sso/authentication_4_spec.ts b/e2e-tests/cypress/tests/integration/channels/auth_sso/authentication_4_spec.ts
index ad5f76dd2e..61130c0a0f 100644
--- a/e2e-tests/cypress/tests/integration/channels/auth_sso/authentication_4_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/auth_sso/authentication_4_spec.ts
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @system_console @authentication
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/benchmark/message_spec.ts b/e2e-tests/cypress/tests/integration/channels/benchmark/message_spec.ts
index 86ae4ec711..8d711d0446 100644
--- a/e2e-tests/cypress/tests/integration/channels/benchmark/message_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/benchmark/message_spec.ts
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging @benchmark
 
 import {reportBenchmarkResults} from '../../../utils/benchmark';
diff --git a/e2e-tests/cypress/tests/integration/channels/channel/open_rhs_coming_from_system_console_spec.ts b/e2e-tests/cypress/tests/integration/channels/channel/open_rhs_coming_from_system_console_spec.ts
index 38a81bd5b7..8b85121498 100644
--- a/e2e-tests/cypress/tests/integration/channels/channel/open_rhs_coming_from_system_console_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/channel/open_rhs_coming_from_system_console_spec.ts
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @channel @rhs
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/channel_sidebar/dm_gm_filtering_sorting_spec.ts b/e2e-tests/cypress/tests/integration/channels/channel_sidebar/dm_gm_filtering_sorting_spec.ts
index 260845d950..9f461cdf3e 100644
--- a/e2e-tests/cypress/tests/integration/channels/channel_sidebar/dm_gm_filtering_sorting_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/channel_sidebar/dm_gm_filtering_sorting_spec.ts
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @dm_category
 
 import * as MESSAGES from '../../../fixtures/messages';
diff --git a/e2e-tests/cypress/tests/integration/channels/channel_sidebar/unread_filter_spec.ts b/e2e-tests/cypress/tests/integration/channels/channel_sidebar/unread_filter_spec.ts
index 01cd8ef71a..1f2c02ac00 100644
--- a/e2e-tests/cypress/tests/integration/channels/channel_sidebar/unread_filter_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/channel_sidebar/unread_filter_spec.ts
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @channel_sidebar
 
 import {
diff --git a/e2e-tests/cypress/tests/integration/channels/collapsed_reply_threads/global_threads_spec.ts b/e2e-tests/cypress/tests/integration/channels/collapsed_reply_threads/global_threads_spec.ts
index 50429e6d15..e95d530516 100644
--- a/e2e-tests/cypress/tests/integration/channels/collapsed_reply_threads/global_threads_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/collapsed_reply_threads/global_threads_spec.ts
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @collapsed_reply_threads
 
 import {Channel} from '@mattermost/types/channels';
diff --git a/e2e-tests/cypress/tests/integration/channels/custom_status/custom_status_1_spec.ts b/e2e-tests/cypress/tests/integration/channels/custom_status/custom_status_1_spec.ts
index 0505fe7c07..df315a1f04 100644
--- a/e2e-tests/cypress/tests/integration/channels/custom_status/custom_status_1_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/custom_status/custom_status_1_spec.ts
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @custom_status
 
 import moment from 'moment-timezone';
diff --git a/e2e-tests/cypress/tests/integration/channels/custom_status/custom_status_2_spec.ts b/e2e-tests/cypress/tests/integration/channels/custom_status/custom_status_2_spec.ts
index 16f453e945..106695b85b 100644
--- a/e2e-tests/cypress/tests/integration/channels/custom_status/custom_status_2_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/custom_status/custom_status_2_spec.ts
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @custom_status
 
 describe('Custom Status - Setting a Custom Status', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/enterprise/extend_session/session_length_spec.ts b/e2e-tests/cypress/tests/integration/channels/enterprise/extend_session/session_length_spec.ts
index c6e47909a6..8b76aa53b6 100644
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/extend_session/session_length_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/extend_session/session_length_spec.ts
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @enterprise @not_cloud @system_console
 
 describe('MM-T2574 Session Lengths', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/enterprise/guest_accounts/guest_removal_ui_spec.ts b/e2e-tests/cypress/tests/integration/channels/enterprise/guest_accounts/guest_removal_ui_spec.ts
index d2833eb5b6..545a0531e9 100644
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/guest_accounts/guest_removal_ui_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/guest_accounts/guest_removal_ui_spec.ts
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @enterprise @guest_account
 
 /**
diff --git a/e2e-tests/cypress/tests/integration/channels/enterprise/ldap/ldap_group_sync_spec.ts b/e2e-tests/cypress/tests/integration/channels/enterprise/ldap/ldap_group_sync_spec.ts
index 1211829fcf..6fc5914775 100644
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/ldap/ldap_group_sync_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/ldap/ldap_group_sync_spec.ts
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @enterprise @ldap
 
 import {Channel} from '@mattermost/types/channels';
diff --git a/e2e-tests/cypress/tests/integration/channels/enterprise/ldap/ldap_guest_spec.ts b/e2e-tests/cypress/tests/integration/channels/enterprise/ldap/ldap_guest_spec.ts
index f74cc7fefe..0f334d4634 100644
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/ldap/ldap_guest_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/ldap/ldap_guest_spec.ts
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @enterprise @ldap
 
 import ldapUsers from '../../../../fixtures/ldap_users.json';
diff --git a/e2e-tests/cypress/tests/integration/channels/enterprise/ldap_group/channel_modes_spec.ts b/e2e-tests/cypress/tests/integration/channels/enterprise/ldap_group/channel_modes_spec.ts
index 2b89402eb2..6d981872dd 100644
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/ldap_group/channel_modes_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/ldap_group/channel_modes_spec.ts
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @enterprise @ldap_group
 
 describe('LDAP Group Sync - Test channel public/private toggle', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/enterprise/profile_popover/profile_popover_spec.ts b/e2e-tests/cypress/tests/integration/channels/enterprise/profile_popover/profile_popover_spec.ts
index 0c160e92b7..877ad35887 100644
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/profile_popover/profile_popover_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/profile_popover/profile_popover_spec.ts
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @enterprise @profile_popover
 
 import * as TIMEOUTS from '../../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/about/edition_and_license_spec.js b/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/about/edition_and_license_spec.js
index c6d0444e72..0eff5acb6e 100644
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/about/edition_and_license_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/about/edition_and_license_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @enterprise @not_cloud @system_console @license_removal
 
 import * as TIMEOUTS from '../../../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/authentication_method_spec.js b/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/authentication_method_spec.js
index 183479c32f..c119965d70 100644
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/authentication_method_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/authentication_method_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @enterprise @system_console @mfa
 
 import ldapUsers from '../../../../fixtures/ldap_users.json';
diff --git a/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/channel_members_spec.js b/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/channel_members_spec.js
index b1a62e89c4..48bed18aa1 100644
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/channel_members_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/channel_members_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @enterprise
 
 import * as TIMEOUTS from '../../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/reporting/site_statistics_spec.js b/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/reporting/site_statistics_spec.js
index a07a707669..03caa232a7 100644
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/reporting/site_statistics_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/reporting/site_statistics_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @enterprise @system_console
 
 import * as TIMEOUTS from '../../../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/sidebar_link_navigation_e20_spec.js b/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/sidebar_link_navigation_e20_spec.js
index 05a23b252b..60066e134d 100644
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/sidebar_link_navigation_e20_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/sidebar_link_navigation_e20_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @enterprise @e20_only @not_cloud @system_console
 
 import * as TIMEOUTS from '../../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/system_scheme_permission_spec.js b/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/system_scheme_permission_spec.js
index 16e43211e2..1ca827f551 100644
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/system_scheme_permission_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/system_scheme_permission_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @enterprise @system_console
 
 import {getAdminAccount} from '../../../../support/env';
diff --git a/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/team_members_spec.js b/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/team_members_spec.js
index 201e1fe493..4891579f8e 100644
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/team_members_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/team_members_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @enterprise
 
 import * as TIMEOUTS from '../../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/team_scheme_permission_spec.js b/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/team_scheme_permission_spec.js
index e3dd7d4f82..8851ae519c 100644
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/team_scheme_permission_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/team_scheme_permission_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @enterprise @system_console
 
 import {getAdminAccount} from '../../../../support/env';
diff --git a/e2e-tests/cypress/tests/integration/channels/files_and_attachments/image_link_preview_spec.js b/e2e-tests/cypress/tests/integration/channels/files_and_attachments/image_link_preview_spec.js
index 431a85bb35..c30eb5e3a7 100644
--- a/e2e-tests/cypress/tests/integration/channels/files_and_attachments/image_link_preview_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/files_and_attachments/image_link_preview_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @files_and_attachments
 
 describe('Image Link Preview', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/integrations/builtin_commands/invalid_commands_spec.js b/e2e-tests/cypress/tests/integration/channels/integrations/builtin_commands/invalid_commands_spec.js
index 100350dee5..5c8a16a6f7 100644
--- a/e2e-tests/cypress/tests/integration/channels/integrations/builtin_commands/invalid_commands_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/integrations/builtin_commands/invalid_commands_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @integrations
 
 import * as MESSAGES from '../../../../fixtures/messages';
diff --git a/e2e-tests/cypress/tests/integration/channels/integrations/incoming_webhook/basic_formatting_spec.js b/e2e-tests/cypress/tests/integration/channels/integrations/incoming_webhook/basic_formatting_spec.js
index 520c5a7646..ec8fd9edba 100644
--- a/e2e-tests/cypress/tests/integration/channels/integrations/incoming_webhook/basic_formatting_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/integrations/incoming_webhook/basic_formatting_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @incoming_webhook
 
 describe('Incoming webhook', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/integrations/incoming_webhook/delete_incoming_webhook_spec.js b/e2e-tests/cypress/tests/integration/channels/integrations/incoming_webhook/delete_incoming_webhook_spec.js
index 618aa88879..e1191e00bf 100644
--- a/e2e-tests/cypress/tests/integration/channels/integrations/incoming_webhook/delete_incoming_webhook_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/integrations/incoming_webhook/delete_incoming_webhook_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @incoming_webhook
 
 import {enableUsernameAndIconOverride} from './helpers';
diff --git a/e2e-tests/cypress/tests/integration/channels/integrations/incoming_webhook/inapp_username_profile_override_spec.js b/e2e-tests/cypress/tests/integration/channels/integrations/incoming_webhook/inapp_username_profile_override_spec.js
index ad7e980ac9..18dd1c2256 100644
--- a/e2e-tests/cypress/tests/integration/channels/integrations/incoming_webhook/inapp_username_profile_override_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/integrations/incoming_webhook/inapp_username_profile_override_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @incoming_webhook
 
 import {getRandomId} from '../../../../utils';
diff --git a/e2e-tests/cypress/tests/integration/channels/integrations/incoming_webhook/long_url_embedded_image_spec.js b/e2e-tests/cypress/tests/integration/channels/integrations/incoming_webhook/long_url_embedded_image_spec.js
index 8e7af21764..d5c113f470 100644
--- a/e2e-tests/cypress/tests/integration/channels/integrations/incoming_webhook/long_url_embedded_image_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/integrations/incoming_webhook/long_url_embedded_image_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @integrations
 
 describe('Integrations', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/integrations/incoming_webhook/setting_spec.js b/e2e-tests/cypress/tests/integration/channels/integrations/incoming_webhook/setting_spec.js
index a5c5d5994a..0ec506ab8d 100644
--- a/e2e-tests/cypress/tests/integration/channels/integrations/incoming_webhook/setting_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/integrations/incoming_webhook/setting_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @incoming_webhook
 
 import {getRandomId} from '../../../../utils';
diff --git a/e2e-tests/cypress/tests/integration/channels/integrations/integrations_search_gives_feedback_spec.js b/e2e-tests/cypress/tests/integration/channels/integrations/integrations_search_gives_feedback_spec.js
index b3bc476151..655e166a8f 100644
--- a/e2e-tests/cypress/tests/integration/channels/integrations/integrations_search_gives_feedback_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/integrations/integrations_search_gives_feedback_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @integrations
 
 import {getRandomId} from '../../../utils';
diff --git a/e2e-tests/cypress/tests/integration/channels/integrations/integrations_spec.js b/e2e-tests/cypress/tests/integration/channels/integrations/integrations_spec.js
index cd30f03d13..7ddfc2bf4c 100644
--- a/e2e-tests/cypress/tests/integration/channels/integrations/integrations_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/integrations/integrations_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @integrations
 
 import {getRandomId} from '../../../utils';
diff --git a/e2e-tests/cypress/tests/integration/channels/integrations/outgoing_webhook/prompt_set_status_spec.js b/e2e-tests/cypress/tests/integration/channels/integrations/outgoing_webhook/prompt_set_status_spec.js
index 47d8ed895e..1c1e62ec4a 100644
--- a/e2e-tests/cypress/tests/integration/channels/integrations/outgoing_webhook/prompt_set_status_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/integrations/outgoing_webhook/prompt_set_status_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 
 import * as TIMEOUTS from '../../../../fixtures/timeouts';
 
diff --git a/e2e-tests/cypress/tests/integration/channels/interactive_menu/slack_parsing_message_button_spec.js b/e2e-tests/cypress/tests/integration/channels/interactive_menu/slack_parsing_message_button_spec.js
index 5085ab6a21..feb1fa84d3 100644
--- a/e2e-tests/cypress/tests/integration/channels/interactive_menu/slack_parsing_message_button_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/interactive_menu/slack_parsing_message_button_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @interactive_menu
 
 /**
diff --git a/e2e-tests/cypress/tests/integration/channels/keyboard_shortcuts/ctrl_cmd_k_focuses_message_box_spec.js b/e2e-tests/cypress/tests/integration/channels/keyboard_shortcuts/ctrl_cmd_k_focuses_message_box_spec.js
index b71bc57b0a..4336f45e1e 100644
--- a/e2e-tests/cypress/tests/integration/channels/keyboard_shortcuts/ctrl_cmd_k_focuses_message_box_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/keyboard_shortcuts/ctrl_cmd_k_focuses_message_box_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @keyboard_shortcuts
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/keyboard_shortcuts/keyboard_shortcuts_2_spec.js b/e2e-tests/cypress/tests/integration/channels/keyboard_shortcuts/keyboard_shortcuts_2_spec.js
index 6b4a9b3346..d4b38a959b 100644
--- a/e2e-tests/cypress/tests/integration/channels/keyboard_shortcuts/keyboard_shortcuts_2_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/keyboard_shortcuts/keyboard_shortcuts_2_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @keyboard_shortcuts
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/markdown/markdown_text_spec.js b/e2e-tests/cypress/tests/integration/channels/markdown/markdown_text_spec.js
index 12734c4d57..e57cb718ef 100644
--- a/e2e-tests/cypress/tests/integration/channels/markdown/markdown_text_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/markdown/markdown_text_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @markdown @not_cloud
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/channel_and_posts_links_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/channel_and_posts_links_spec.js
index 1739a0f2ce..f526eaef85 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/channel_and_posts_links_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/channel_and_posts_links_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/channel_read_after_permalink_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/channel_read_after_permalink_spec.js
index 74a532bb79..46218f5606 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/channel_read_after_permalink_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/channel_read_after_permalink_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/emoji_followed_by_punctuation_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/emoji_followed_by_punctuation_spec.js
index b6a7742fec..77b9f1c037 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/emoji_followed_by_punctuation_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/emoji_followed_by_punctuation_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging
 
 function emojiVerification(postId) {
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/emoji_insert_position_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/emoji_insert_position_spec.js
index eb0189b983..4dc78ab79b 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/emoji_insert_position_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/emoji_insert_position_spec.js
@@ -7,7 +7,6 @@
 // Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging
 
 describe('Messaging', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/emoji_size_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/emoji_size_spec.js
index 50ae5e8909..7b2f079c13 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/emoji_size_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/emoji_size_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging
 
 describe('Messaging', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/emoji_skin_tone_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/emoji_skin_tone_spec.js
index c179017199..fedea18e32 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/emoji_skin_tone_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/emoji_skin_tone_spec.js
@@ -7,7 +7,6 @@
 // Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging
 
 describe('Messaging', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/emoji_to_markdown_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/emoji_to_markdown_spec.js
index d0348cf521..f41c2d6731 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/emoji_to_markdown_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/emoji_to_markdown_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/file_upload_in_center_channel_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/file_upload_in_center_channel_spec.js
index b39dd3705e..68a6eb5324 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/file_upload_in_center_channel_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/file_upload_in_center_channel_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging
 
 describe('Messaging', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/image_attachment_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/image_attachment_spec.js
index 3568b31e86..a1c5c2428a 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/image_attachment_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/image_attachment_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging
 
 describe('Image attachment', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/message_bullets_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/message_bullets_spec.js
index 89ba3e4fbc..225caa55cb 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/message_bullets_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/message_bullets_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging
 
 describe('Message', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/message_channel_draw_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/message_channel_draw_spec.js
index 9861722ff5..a010f8615e 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/message_channel_draw_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/message_channel_draw_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @not_cloud @messaging @plugin
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/message_parse_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/message_parse_spec.js
index a6e6bb7fde..9664a423ce 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/message_parse_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/message_parse_spec.js
@@ -7,7 +7,6 @@
 // Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging
 
 describe('Messaging', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/message_permalink_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/message_permalink_spec.js
index 6fa189bdd3..1d751ee450 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/message_permalink_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/message_permalink_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/message_pinning_unpinning_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/message_pinning_unpinning_spec.js
index a0865275c8..4098a55c57 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/message_pinning_unpinning_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/message_pinning_unpinning_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging
 
 const pinnedPosts = [];
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/message_reply_scrollable_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/message_reply_scrollable_spec.js
index 0f3ba2bcae..97b61b5b6a 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/message_reply_scrollable_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/message_reply_scrollable_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging
 
 describe('Message reply scrollable', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/message_shortlinking_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/message_shortlinking_spec.js
index b4f01d717c..b38b3317d8 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/message_shortlinking_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/message_shortlinking_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging
 
 describe('Message', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/permalink_click_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/permalink_click_spec.js
index 67a842c41b..5eef7e0511 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/permalink_click_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/permalink_click_spec.js
@@ -7,7 +7,6 @@
 // Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/pinned_posts_1_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/pinned_posts_1_spec.js
index e720adb89a..a019a6ce94 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/pinned_posts_1_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/pinned_posts_1_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging
 
 describe('Messaging', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/tooltips_on_top_nav_channel_icons_posts_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/tooltips_on_top_nav_channel_icons_posts_spec.js
index e1eeaed599..839bfd2269 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/tooltips_on_top_nav_channel_icons_posts_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/tooltips_on_top_nav_channel_icons_posts_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging @plugin @not_cloud
 
 import {demoPlugin} from '../../../utils/plugins';
diff --git a/e2e-tests/cypress/tests/integration/channels/notifications/channel_links_show_as_links_spec.js b/e2e-tests/cypress/tests/integration/channels/notifications/channel_links_show_as_links_spec.js
index 5a30952ba2..73ca7d0244 100644
--- a/e2e-tests/cypress/tests/integration/channels/notifications/channel_links_show_as_links_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/notifications/channel_links_show_as_links_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @notifications
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/plugins/plugin_buttons_spec.js b/e2e-tests/cypress/tests/integration/channels/plugins/plugin_buttons_spec.js
index 6c8d821649..deaf41d9fd 100644
--- a/e2e-tests/cypress/tests/integration/channels/plugins/plugin_buttons_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/plugins/plugin_buttons_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @plugin @plugins_uninstall @not_cloud
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/scroll/channel_scroll_spec.js b/e2e-tests/cypress/tests/integration/channels/scroll/channel_scroll_spec.js
index 34ba206b99..9beeb452b1 100644
--- a/e2e-tests/cypress/tests/integration/channels/scroll/channel_scroll_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/scroll/channel_scroll_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @scroll
 
 import * as MESSAGES from '../../../fixtures/messages';
diff --git a/e2e-tests/cypress/tests/integration/channels/scroll/fixed_width_spec.js b/e2e-tests/cypress/tests/integration/channels/scroll/fixed_width_spec.js
index e5f2a0930b..9327a734a8 100644
--- a/e2e-tests/cypress/tests/integration/channels/scroll/fixed_width_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/scroll/fixed_width_spec.js
@@ -9,7 +9,6 @@ const timeouts = require('../../../fixtures/timeouts');
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @scroll
 
 describe('Scroll', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/search/post_search_display_not_cloud_spec.js b/e2e-tests/cypress/tests/integration/channels/search/post_search_display_not_cloud_spec.js
index dbdc1160e8..0cd11247b0 100644
--- a/e2e-tests/cypress/tests/integration/channels/search/post_search_display_not_cloud_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/search/post_search_display_not_cloud_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @search @not_cloud
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/settings/display/clock_display_mode_spec.js b/e2e-tests/cypress/tests/integration/channels/settings/display/clock_display_mode_spec.js
index c8c6450a51..ba7c50533a 100644
--- a/e2e-tests/cypress/tests/integration/channels/settings/display/clock_display_mode_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/settings/display/clock_display_mode_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @account_setting
 
 import moment from 'moment-timezone';
diff --git a/e2e-tests/cypress/tests/integration/channels/signin_authentication/signup_spec.js b/e2e-tests/cypress/tests/integration/channels/signin_authentication/signup_spec.js
index 71db9fb3fe..72b3ed57b2 100644
--- a/e2e-tests/cypress/tests/integration/channels/signin_authentication/signup_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/signin_authentication/signup_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @signin_authentication
 
 import {FixedCloudConfig} from '../../../utils/constants';
diff --git a/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/announcement_banner_spec.js b/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/announcement_banner_spec.js
index 32b391b511..b54aa1cde4 100644
--- a/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/announcement_banner_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/announcement_banner_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @enterprise @system_console @announcement_banner
 
 import {hexToRgbArray, rgbArrayToString} from '../../../../utils';
diff --git a/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/customization_spec.js b/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/customization_spec.js
index e3129921d7..25b70f7b39 100644
--- a/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/customization_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/customization_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @system_console
 
 import * as TIMEOUTS from '../../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/system_console/user_management_spec.js b/e2e-tests/cypress/tests/integration/channels/system_console/user_management_spec.js
index e7ea290bd2..eb1b987152 100644
--- a/e2e-tests/cypress/tests/integration/channels/system_console/user_management_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/system_console/user_management_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @system_console
 
 import {
diff --git a/e2e-tests/cypress/tests/integration/channels/team_settings/invite_user_to_closed_team_spec.js b/e2e-tests/cypress/tests/integration/channels/team_settings/invite_user_to_closed_team_spec.js
index 6e61eae7c3..5fa68785d3 100644
--- a/e2e-tests/cypress/tests/integration/channels/team_settings/invite_user_to_closed_team_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/team_settings/invite_user_to_closed_team_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @team_settings
 
 import {getRandomId} from '../../../utils';
diff --git a/e2e-tests/cypress/tests/integration/channels/test_notification/trigger_browser_notification_spec.ts b/e2e-tests/cypress/tests/integration/channels/test_notification/trigger_browser_notification_spec.ts
index 7bc118dcf6..aedcb2733f 100644
--- a/e2e-tests/cypress/tests/integration/channels/test_notification/trigger_browser_notification_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/test_notification/trigger_browser_notification_spec.ts
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @notification
 
 describe('Verify users can receive notification on browser', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/toast/permalink_post_spec.js b/e2e-tests/cypress/tests/integration/channels/toast/permalink_post_spec.js
index 2e82db763c..1864edd91e 100644
--- a/e2e-tests/cypress/tests/integration/channels/toast/permalink_post_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/toast/permalink_post_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @toast
 
 describe('Toast', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/toast/permalink_post_with_new_message_spec.js b/e2e-tests/cypress/tests/integration/channels/toast/permalink_post_with_new_message_spec.js
index 816e94b4a0..de957516cb 100644
--- a/e2e-tests/cypress/tests/integration/channels/toast/permalink_post_with_new_message_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/toast/permalink_post_with_new_message_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @toast
 
 import {getRandomId} from '../../../utils';
diff --git a/e2e-tests/playwright/playwright.config.ts b/e2e-tests/playwright/playwright.config.ts
index e948908aaf..e978c2528e 100644
--- a/e2e-tests/playwright/playwright.config.ts
+++ b/e2e-tests/playwright/playwright.config.ts
@@ -72,6 +72,7 @@ export default defineConfig({
         },
     ],
     reporter: [
+        ...(testConfig.isCI ? [['blob', {outputDir: './results/blob-report'}] as const] : []),
         ['html', {open: 'never', outputFolder: './results/reporter'}],
         ['json', {outputFile: './results/reporter/results.json'}],
         ['junit', {outputFile: './results/reporter/results.xml'}],
diff --git a/e2e-tests/playwright/specs/functional/channels/channel_banner/channel_banner.spec.ts b/e2e-tests/playwright/specs/functional/channels/channel_banner/channel_banner.spec.ts
index 1f45542b1e..dd0929843f 100644
--- a/e2e-tests/playwright/specs/functional/channels/channel_banner/channel_banner.spec.ts
+++ b/e2e-tests/playwright/specs/functional/channels/channel_banner/channel_banner.spec.ts
@@ -20,7 +20,7 @@ test('Should show channel banner when configured', async ({pw}) => {
 
     await configurationTab.enableChannelBanner();
     await configurationTab.setChannelBannerText('Example channel banner text');
-    await configurationTab.setChannelBannerTextColor('#77DD88');
+    await configurationTab.setChannelBannerTextColor('77DD88');
 
     await configurationTab.save();
     await settingsModal.closeModal();
@@ -65,7 +65,7 @@ test('Should render markdown', async ({pw}) => {
 
     await configurationTab.enableChannelBanner();
     await configurationTab.setChannelBannerText('**bold** *italic* ~~strikethrough~~');
-    await configurationTab.setChannelBannerTextColor('#77DD88');
+    await configurationTab.setChannelBannerTextColor('77DD88');
 
     await configurationTab.save();
     await settingsModal.closeModal();
diff --git a/e2e-tests/playwright/specs/functional/system_console/mobile_security.spec.ts b/e2e-tests/playwright/specs/functional/system_console/mobile_security.spec.ts
index d55c92db8c..640ff7af97 100644
--- a/e2e-tests/playwright/specs/functional/system_console/mobile_security.spec.ts
+++ b/e2e-tests/playwright/specs/functional/system_console/mobile_security.spec.ts
@@ -9,7 +9,7 @@ test('should be able to enable mobile security settings when licensed', async ({
     const license = await adminClient.getClientLicenseOld();
 
     test.skip(
-        license.SkuShortName !== 'enterprise' || license.short_sku_name !== 'advanced',
+        license.SkuShortName !== 'enterprise' && license.SkuShortName !== 'advanced',
         'Skipping test - server has no enterprise or enterprise advanced license',
     );
 
@@ -162,7 +162,10 @@ test('should show mobile security upsell when not licensed', async ({pw}) => {
 
     const license = await adminClient.getClientLicenseOld();
 
-    test.skip(license.SkuShortName === 'enterprise', 'Skipping test - server has enterprise license');
+    test.skip(
+        license.SkuShortName === 'enterprise' || license.SkuShortName === 'advanced',
+        'Skipping test - server has enterprise or enterprise advanced license',
+    );
 
     if (!adminUser) {
         throw new Error('Failed to create admin user');