From b4805a612fc27b4977d7a6223b47ef984de18bfb Mon Sep 17 00:00:00 2001
From: Saturnino Abril <saturnino.abril@gmail.com>
Date: Tue, 17 Nov 2020 19:19:29 +0800
Subject: [PATCH] promote and demote tests to/from prod (#7080)

---
 .../archive_channel_member_spec.js            |  1 +
 .../archive_channel_post_spec.js              |  2 ++
 .../archive_channel_reaction_spec.js          |  2 ++
 .../archived_channel/post_menu_spec.js        |  1 +
 .../integration/bot_accounts/bot_api_spec.js  |  1 +
 .../integration/bot_accounts/crud_spec.js     |  1 +
 .../managing_bot_accounts_spec.js             |  1 +
 .../channel_sidebar/unread_filter_spec.js     |  1 +
 .../integration/emoji/custom_emoji_spec.js    |  1 +
 .../managing_bot_accounts_spec.js             |  1 +
 .../group_mentions_system_messages_spec.js    |  1 +
 .../guest_accounts/guest_feature_spec.js      |  1 +
 .../guest_identification_spec.js              |  1 +
 .../system_console_guest_access_ui_spec.js    | 19 -------------------
 .../profile_popover/profile_popover_spec.js   |  1 +
 .../about/edition_and_license_spec.js         |  1 +
 .../system_console/channel_members_spec.js    |  1 +
 .../enterprise/system_console/cluster_spec.js |  1 -
 .../system_console/main_menu_spec.js          |  1 +
 .../reporting/site_statistics_spec.js         |  1 +
 .../system_console/search_box_spec.js         |  1 +
 .../upload_files_spec.js                      |  1 +
 .../builtin_commands/common_commands_spec.js  |  1 +
 .../cancel_out_of_edit_spec.js                |  1 +
 .../description_length_check_spec.js          |  1 +
 ...disallow_username_profile_override_spec.js |  1 +
 ...ions_display_on_team_where_created_spec.js |  1 +
 .../integrations/integrations_page_spec.js    |  1 +
 ...integrations_search_gives_feedback_spec.js |  1 +
 .../delete_outgoing_webhook_spec.js           |  1 +
 .../disable_outgoing_webhook_spec.js          |  1 +
 .../disable_override_username_profile_spec.js |  2 ++
 .../search_on_outgoing_webhooks_spec.js       |  1 +
 .../outgoing_webhook/token_copy_icon_spec.js  |  1 +
 ...plugin_slash_command_stays_visible_spec.js |  1 +
 .../markdown/markdown_image_spec.js           |  1 -
 .../inline_images_open_preview_window_spec.js |  1 +
 ...line_markdown_image_link_open_link_spec.js |  1 -
 .../messaging/pinned_posts_part2_spec.js      |  1 +
 ...ips_on_top_nav_channel_icons_posts_spec.js |  1 +
 .../integration/modals/quick_switcher_spec.js |  2 ++
 .../desktop_notifications_spec.js             |  1 +
 ...validate_pending_email_invitations_spec.js |  1 +
 .../system_console/main_menu_spec.js          |  1 +
 .../system_console/plugin_upload_spec.js      |  1 +
 .../reporting/site_statistics_spec.js         |  1 +
 .../reporting/team_statistics_spec.js         |  1 +
 .../system_console/search_box_spec.js         |  1 +
 .../system_console/unsaved_changes_spec.js    |  1 +
 ..._invite_with_non_mattermost_domain_spec.js |  1 +
 ...d_team_invite_with_specific_domain_spec.js |  1 +
 51 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/e2e/cypress/integration/archived_channel/archive_channel_member_spec.js b/e2e/cypress/integration/archived_channel/archive_channel_member_spec.js
index 2455cfccf281..44f214c6eb42 100644
--- a/e2e/cypress/integration/archived_channel/archive_channel_member_spec.js
+++ b/e2e/cypress/integration/archived_channel/archive_channel_member_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @channel
 
 describe('Archive channel members spec', () => {
diff --git a/e2e/cypress/integration/archived_channel/archive_channel_post_spec.js b/e2e/cypress/integration/archived_channel/archive_channel_post_spec.js
index 3009ac392c8b..c2efbbe5cd72 100644
--- a/e2e/cypress/integration/archived_channel/archive_channel_post_spec.js
+++ b/e2e/cypress/integration/archived_channel/archive_channel_post_spec.js
@@ -7,7 +7,9 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @channel
+
 import * as TIMEOUTS from '../../fixtures/timeouts';
 
 describe('Archived channels', () => {
diff --git a/e2e/cypress/integration/archived_channel/archive_channel_reaction_spec.js b/e2e/cypress/integration/archived_channel/archive_channel_reaction_spec.js
index e32e4da975b3..8f8dbff09c1e 100644
--- a/e2e/cypress/integration/archived_channel/archive_channel_reaction_spec.js
+++ b/e2e/cypress/integration/archived_channel/archive_channel_reaction_spec.js
@@ -7,7 +7,9 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @channel
+
 import * as TIMEOUTS from '../../fixtures/timeouts';
 
 describe('Archived channels', () => {
diff --git a/e2e/cypress/integration/archived_channel/post_menu_spec.js b/e2e/cypress/integration/archived_channel/post_menu_spec.js
index aceb6d3b5370..cde20f476963 100644
--- a/e2e/cypress/integration/archived_channel/post_menu_spec.js
+++ b/e2e/cypress/integration/archived_channel/post_menu_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @channel
 
 describe('Archived channels', () => {
diff --git a/e2e/cypress/integration/bot_accounts/bot_api_spec.js b/e2e/cypress/integration/bot_accounts/bot_api_spec.js
index 3876aea25c5f..dd41dac500b2 100644
--- a/e2e/cypress/integration/bot_accounts/bot_api_spec.js
+++ b/e2e/cypress/integration/bot_accounts/bot_api_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @bot_accounts
 
 import * as TIMEOUTS from '../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/bot_accounts/crud_spec.js b/e2e/cypress/integration/bot_accounts/crud_spec.js
index 3baaabe0b23d..d4fcaf5c1d11 100644
--- a/e2e/cypress/integration/bot_accounts/crud_spec.js
+++ b/e2e/cypress/integration/bot_accounts/crud_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @bot_accounts
 
 import {getRandomId} from '../../utils';
diff --git a/e2e/cypress/integration/bot_accounts/managing_bot_accounts_spec.js b/e2e/cypress/integration/bot_accounts/managing_bot_accounts_spec.js
index 7e3ba7227268..027dcc64c0b6 100644
--- a/e2e/cypress/integration/bot_accounts/managing_bot_accounts_spec.js
+++ b/e2e/cypress/integration/bot_accounts/managing_bot_accounts_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @bot_accounts
 
 import * as TIMEOUTS from '../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/channel_sidebar/unread_filter_spec.js b/e2e/cypress/integration/channel_sidebar/unread_filter_spec.js
index 8075680b9cfb..932233d54331 100644
--- a/e2e/cypress/integration/channel_sidebar/unread_filter_spec.js
+++ b/e2e/cypress/integration/channel_sidebar/unread_filter_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @channel_sidebar
 
 import {
diff --git a/e2e/cypress/integration/emoji/custom_emoji_spec.js b/e2e/cypress/integration/emoji/custom_emoji_spec.js
index 04da416472d9..7e9bc666cd05 100644
--- a/e2e/cypress/integration/emoji/custom_emoji_spec.js
+++ b/e2e/cypress/integration/emoji/custom_emoji_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @emoji
 
 import * as TIMEOUTS from '../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/enterprise/bot_accounts/managing_bot_accounts_spec.js b/e2e/cypress/integration/enterprise/bot_accounts/managing_bot_accounts_spec.js
index c5d6ebfea308..54cfd2976b62 100644
--- a/e2e/cypress/integration/enterprise/bot_accounts/managing_bot_accounts_spec.js
+++ b/e2e/cypress/integration/enterprise/bot_accounts/managing_bot_accounts_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @enterprise @bot_accounts
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/enterprise/group_mentions/group_mentions_system_messages_spec.js b/e2e/cypress/integration/enterprise/group_mentions/group_mentions_system_messages_spec.js
index f4d05a76a96d..7fd1374b6e82 100644
--- a/e2e/cypress/integration/enterprise/group_mentions/group_mentions_system_messages_spec.js
+++ b/e2e/cypress/integration/enterprise/group_mentions/group_mentions_system_messages_spec.js
@@ -6,6 +6,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @enterprise @system_console @group_mentions
 
 import ldapUsers from '../../../fixtures/ldap_users.json';
diff --git a/e2e/cypress/integration/enterprise/guest_accounts/guest_feature_spec.js b/e2e/cypress/integration/enterprise/guest_accounts/guest_feature_spec.js
index a4e3c357e9d6..b3fad10cc4e5 100644
--- a/e2e/cypress/integration/enterprise/guest_accounts/guest_feature_spec.js
+++ b/e2e/cypress/integration/enterprise/guest_accounts/guest_feature_spec.js
@@ -9,6 +9,7 @@ const timeouts = require('../../../fixtures/timeouts');
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @enterprise @guest_account
 
 /**
diff --git a/e2e/cypress/integration/enterprise/guest_accounts/guest_identification_spec.js b/e2e/cypress/integration/enterprise/guest_accounts/guest_identification_spec.js
index 45f41be39933..740c645ffbe1 100644
--- a/e2e/cypress/integration/enterprise/guest_accounts/guest_identification_spec.js
+++ b/e2e/cypress/integration/enterprise/guest_accounts/guest_identification_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @enterprise @guest_account
 
 /**
diff --git a/e2e/cypress/integration/enterprise/guest_accounts/system_console_guest_access_ui_spec.js b/e2e/cypress/integration/enterprise/guest_accounts/system_console_guest_access_ui_spec.js
index 1236e25d16b9..d33386062670 100644
--- a/e2e/cypress/integration/enterprise/guest_accounts/system_console_guest_access_ui_spec.js
+++ b/e2e/cypress/integration/enterprise/guest_accounts/system_console_guest_access_ui_spec.js
@@ -13,7 +13,6 @@
 /**
  * Note: This test requires Enterprise license to be uploaded
  */
-import * as TIMEOUTS from '../../../fixtures/timeouts';
 
 describe('Guest Account - Verify Guest Access UI', () => {
     beforeEach(() => {
@@ -106,22 +105,4 @@ describe('Guest Account - Verify Guest Access UI', () => {
         cy.findByTestId('inviteGuestLink').should('not.exist');
         cy.findByTestId('inputPlaceholder').should('be.visible');
     });
-
-    it('MM-T1411 Update Guest Users in User Management when Guest feature is disabled', () => {
-        cy.apiCreateGuestUser().then(({guest}) => {
-            // # Disable Guest Access and save
-            cy.findByTestId('GuestAccountsSettings.Enablefalse').click();
-            cy.get('#saveSetting').should('be.visible').click();
-            cy.get('#confirmModalButton').should('be.visible').click().wait(TIMEOUTS.THREE_SEC);
-
-            // # Visit the User Management Users page
-            cy.visit('/admin_console/user_management/users');
-
-            // # Search for the guest user
-            cy.get('#searchUsers').should('be.visible').type(guest.username);
-            cy.findByTestId('userListRow').within(() => {
-                cy.findByText('Inactive').should('be.visible');
-            });
-        });
-    });
 });
diff --git a/e2e/cypress/integration/enterprise/profile_popover/profile_popover_spec.js b/e2e/cypress/integration/enterprise/profile_popover/profile_popover_spec.js
index 3c5868dd0241..aca856445d6e 100644
--- a/e2e/cypress/integration/enterprise/profile_popover/profile_popover_spec.js
+++ b/e2e/cypress/integration/enterprise/profile_popover/profile_popover_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @enterprise @profile_popover
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/enterprise/system_console/about/edition_and_license_spec.js b/e2e/cypress/integration/enterprise/system_console/about/edition_and_license_spec.js
index 9b218f6f664b..70b3565a8c6d 100644
--- a/e2e/cypress/integration/enterprise/system_console/about/edition_and_license_spec.js
+++ b/e2e/cypress/integration/enterprise/system_console/about/edition_and_license_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @enterprise @system_console
 
 import * as TIMEOUTS from '../../../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/enterprise/system_console/channel_members_spec.js b/e2e/cypress/integration/enterprise/system_console/channel_members_spec.js
index cea1c303cbc3..28a178b4d3f5 100644
--- a/e2e/cypress/integration/enterprise/system_console/channel_members_spec.js
+++ b/e2e/cypress/integration/enterprise/system_console/channel_members_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @enterprise
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/enterprise/system_console/cluster_spec.js b/e2e/cypress/integration/enterprise/system_console/cluster_spec.js
index dc9c61eec042..f284457e4d1c 100644
--- a/e2e/cypress/integration/enterprise/system_console/cluster_spec.js
+++ b/e2e/cypress/integration/enterprise/system_console/cluster_spec.js
@@ -6,7 +6,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @enterprise @system_console
 
 describe('Cluster', () => {
diff --git a/e2e/cypress/integration/enterprise/system_console/main_menu_spec.js b/e2e/cypress/integration/enterprise/system_console/main_menu_spec.js
index 721125130c44..b438addc9c28 100644
--- a/e2e/cypress/integration/enterprise/system_console/main_menu_spec.js
+++ b/e2e/cypress/integration/enterprise/system_console/main_menu_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @enterprise @system_console
 
 // # Goes to the System Scheme page as System Admin
diff --git a/e2e/cypress/integration/enterprise/system_console/reporting/site_statistics_spec.js b/e2e/cypress/integration/enterprise/system_console/reporting/site_statistics_spec.js
index 5e12f26ff1a9..63c2510b3638 100644
--- a/e2e/cypress/integration/enterprise/system_console/reporting/site_statistics_spec.js
+++ b/e2e/cypress/integration/enterprise/system_console/reporting/site_statistics_spec.js
@@ -6,6 +6,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @enterprise @system_console
 
 import * as TIMEOUTS from '../../../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/enterprise/system_console/search_box_spec.js b/e2e/cypress/integration/enterprise/system_console/search_box_spec.js
index 6b639248cdad..1da25ac3183b 100644
--- a/e2e/cypress/integration/enterprise/system_console/search_box_spec.js
+++ b/e2e/cypress/integration/enterprise/system_console/search_box_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @enterprise @system_console
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/files_and_attachments/upload_files_spec.js b/e2e/cypress/integration/files_and_attachments/upload_files_spec.js
index 816c530acbe4..3d7ae143a941 100644
--- a/e2e/cypress/integration/files_and_attachments/upload_files_spec.js
+++ b/e2e/cypress/integration/files_and_attachments/upload_files_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @file_and_attachments
 
 import * as MESSAGES from '../../fixtures/messages';
diff --git a/e2e/cypress/integration/integrations/builtin_commands/common_commands_spec.js b/e2e/cypress/integration/integrations/builtin_commands/common_commands_spec.js
index 1027350b6bbf..f81377b9e400 100644
--- a/e2e/cypress/integration/integrations/builtin_commands/common_commands_spec.js
+++ b/e2e/cypress/integration/integrations/builtin_commands/common_commands_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @integrations
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/integrations/incoming_webhook/cancel_out_of_edit_spec.js b/e2e/cypress/integration/integrations/incoming_webhook/cancel_out_of_edit_spec.js
index e6b288e364a8..5e80be2730a5 100644
--- a/e2e/cypress/integration/integrations/incoming_webhook/cancel_out_of_edit_spec.js
+++ b/e2e/cypress/integration/integrations/incoming_webhook/cancel_out_of_edit_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @integrations
 
 describe('Integrations', () => {
diff --git a/e2e/cypress/integration/integrations/incoming_webhook/description_length_check_spec.js b/e2e/cypress/integration/integrations/incoming_webhook/description_length_check_spec.js
index 21590bd874e1..fdd0adc07d72 100644
--- a/e2e/cypress/integration/integrations/incoming_webhook/description_length_check_spec.js
+++ b/e2e/cypress/integration/integrations/incoming_webhook/description_length_check_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @integrations
 
 describe('Integrations', () => {
diff --git a/e2e/cypress/integration/integrations/incoming_webhook/disallow_username_profile_override_spec.js b/e2e/cypress/integration/integrations/incoming_webhook/disallow_username_profile_override_spec.js
index d39d0eb6bc45..3851ac203079 100644
--- a/e2e/cypress/integration/integrations/incoming_webhook/disallow_username_profile_override_spec.js
+++ b/e2e/cypress/integration/integrations/incoming_webhook/disallow_username_profile_override_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @incoming_webhook
 
 import {getRandomId} from '../../../utils';
diff --git a/e2e/cypress/integration/integrations/incoming_webhook/integrations_display_on_team_where_created_spec.js b/e2e/cypress/integration/integrations/incoming_webhook/integrations_display_on_team_where_created_spec.js
index c23fad2ee717..e5739d3bd821 100644
--- a/e2e/cypress/integration/integrations/incoming_webhook/integrations_display_on_team_where_created_spec.js
+++ b/e2e/cypress/integration/integrations/incoming_webhook/integrations_display_on_team_where_created_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @integrations
 
 describe('Integrations', () => {
diff --git a/e2e/cypress/integration/integrations/integrations_page_spec.js b/e2e/cypress/integration/integrations/integrations_page_spec.js
index 9e2ace760b0e..0355d2fc4be0 100644
--- a/e2e/cypress/integration/integrations/integrations_page_spec.js
+++ b/e2e/cypress/integration/integrations/integrations_page_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @integrations
 
 describe('Integrations', () => {
diff --git a/e2e/cypress/integration/integrations/integrations_search_gives_feedback_spec.js b/e2e/cypress/integration/integrations/integrations_search_gives_feedback_spec.js
index 8241ad501c20..cab420464eb7 100644
--- a/e2e/cypress/integration/integrations/integrations_search_gives_feedback_spec.js
+++ b/e2e/cypress/integration/integrations/integrations_search_gives_feedback_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @integrations
 
 import {getRandomId} from '../../utils';
diff --git a/e2e/cypress/integration/integrations/outgoing_webhook/delete_outgoing_webhook_spec.js b/e2e/cypress/integration/integrations/outgoing_webhook/delete_outgoing_webhook_spec.js
index b76ccbee9e7e..94f7ebfbbbf6 100644
--- a/e2e/cypress/integration/integrations/outgoing_webhook/delete_outgoing_webhook_spec.js
+++ b/e2e/cypress/integration/integrations/outgoing_webhook/delete_outgoing_webhook_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @integrations
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/integrations/outgoing_webhook/disable_outgoing_webhook_spec.js b/e2e/cypress/integration/integrations/outgoing_webhook/disable_outgoing_webhook_spec.js
index 55dfea81e41f..6c40d1842628 100644
--- a/e2e/cypress/integration/integrations/outgoing_webhook/disable_outgoing_webhook_spec.js
+++ b/e2e/cypress/integration/integrations/outgoing_webhook/disable_outgoing_webhook_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @integrations
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/integrations/outgoing_webhook/disable_override_username_profile_spec.js b/e2e/cypress/integration/integrations/outgoing_webhook/disable_override_username_profile_spec.js
index 66c408146045..8e9ee0f5924a 100644
--- a/e2e/cypress/integration/integrations/outgoing_webhook/disable_override_username_profile_spec.js
+++ b/e2e/cypress/integration/integrations/outgoing_webhook/disable_override_username_profile_spec.js
@@ -7,7 +7,9 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @outgoing_webhook
+
 /* eslint-disable max-lines */
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/integrations/outgoing_webhook/search_on_outgoing_webhooks_spec.js b/e2e/cypress/integration/integrations/outgoing_webhook/search_on_outgoing_webhooks_spec.js
index 2213369d1dea..5b3b35ed0976 100644
--- a/e2e/cypress/integration/integrations/outgoing_webhook/search_on_outgoing_webhooks_spec.js
+++ b/e2e/cypress/integration/integrations/outgoing_webhook/search_on_outgoing_webhooks_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @integrations
 
 describe('Integrations', () => {
diff --git a/e2e/cypress/integration/integrations/outgoing_webhook/token_copy_icon_spec.js b/e2e/cypress/integration/integrations/outgoing_webhook/token_copy_icon_spec.js
index 4eab61d69fca..9a40bffefebf 100644
--- a/e2e/cypress/integration/integrations/outgoing_webhook/token_copy_icon_spec.js
+++ b/e2e/cypress/integration/integrations/outgoing_webhook/token_copy_icon_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @integrations
 
 describe('Integrations', () => {
diff --git a/e2e/cypress/integration/integrations/plugin_slash_command_stays_visible_spec.js b/e2e/cypress/integration/integrations/plugin_slash_command_stays_visible_spec.js
index deb060a9429f..bee63cbd84d6 100644
--- a/e2e/cypress/integration/integrations/plugin_slash_command_stays_visible_spec.js
+++ b/e2e/cypress/integration/integrations/plugin_slash_command_stays_visible_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @integrations
 
 describe('Integrations', () => {
diff --git a/e2e/cypress/integration/markdown/markdown_image_spec.js b/e2e/cypress/integration/markdown/markdown_image_spec.js
index 64ffd57c3b5a..4b0ebf713be4 100644
--- a/e2e/cypress/integration/markdown/markdown_image_spec.js
+++ b/e2e/cypress/integration/markdown/markdown_image_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @markdown
 
 describe('Markdown', () => {
diff --git a/e2e/cypress/integration/messaging/inline_images_open_preview_window_spec.js b/e2e/cypress/integration/messaging/inline_images_open_preview_window_spec.js
index 3e74fa5c505c..236091ecc360 100644
--- a/e2e/cypress/integration/messaging/inline_images_open_preview_window_spec.js
+++ b/e2e/cypress/integration/messaging/inline_images_open_preview_window_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @messaging
 
 describe('Messaging', () => {
diff --git a/e2e/cypress/integration/messaging/inline_markdown_image_link_open_link_spec.js b/e2e/cypress/integration/messaging/inline_markdown_image_link_open_link_spec.js
index aaf01f8d89b4..b5b408d1550a 100644
--- a/e2e/cypress/integration/messaging/inline_markdown_image_link_open_link_spec.js
+++ b/e2e/cypress/integration/messaging/inline_markdown_image_link_open_link_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @messaging
 
 describe('Messaging', () => {
diff --git a/e2e/cypress/integration/messaging/pinned_posts_part2_spec.js b/e2e/cypress/integration/messaging/pinned_posts_part2_spec.js
index 0da977c9e711..c250be647c2b 100644
--- a/e2e/cypress/integration/messaging/pinned_posts_part2_spec.js
+++ b/e2e/cypress/integration/messaging/pinned_posts_part2_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @messaging
 
 import * as TIMEOUTS from '../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/messaging/visual_verification_of_tooltips_on_top_nav_channel_icons_posts_spec.js b/e2e/cypress/integration/messaging/visual_verification_of_tooltips_on_top_nav_channel_icons_posts_spec.js
index 6660be3a279c..735418441115 100644
--- a/e2e/cypress/integration/messaging/visual_verification_of_tooltips_on_top_nav_channel_icons_posts_spec.js
+++ b/e2e/cypress/integration/messaging/visual_verification_of_tooltips_on_top_nav_channel_icons_posts_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @messaging
 
 describe('Messaging', () => {
diff --git a/e2e/cypress/integration/modals/quick_switcher_spec.js b/e2e/cypress/integration/modals/quick_switcher_spec.js
index 8e7bdfc15328..27e97981ade4 100644
--- a/e2e/cypress/integration/modals/quick_switcher_spec.js
+++ b/e2e/cypress/integration/modals/quick_switcher_spec.js
@@ -7,7 +7,9 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @modals
+
 import * as TIMEOUTS from '../../fixtures/timeouts';
 
 describe('Quick switcher', () => {
diff --git a/e2e/cypress/integration/notifications/desktop_notifications_spec.js b/e2e/cypress/integration/notifications/desktop_notifications_spec.js
index b90d04005355..09f8f0349e3e 100644
--- a/e2e/cypress/integration/notifications/desktop_notifications_spec.js
+++ b/e2e/cypress/integration/notifications/desktop_notifications_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @notifications
 
 import * as MESSAGES from '../../fixtures/messages';
diff --git a/e2e/cypress/integration/onboarding/invalidate_pending_email_invitations_spec.js b/e2e/cypress/integration/onboarding/invalidate_pending_email_invitations_spec.js
index 6eaa3c3fd0a0..311437937b9b 100644
--- a/e2e/cypress/integration/onboarding/invalidate_pending_email_invitations_spec.js
+++ b/e2e/cypress/integration/onboarding/invalidate_pending_email_invitations_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @onboarding
 
 import * as TIMEOUTS from '../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/system_console/main_menu_spec.js b/e2e/cypress/integration/system_console/main_menu_spec.js
index da57c7c568c2..69455e4f1165 100644
--- a/e2e/cypress/integration/system_console/main_menu_spec.js
+++ b/e2e/cypress/integration/system_console/main_menu_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @system_console
 
 // # Goes to the System Scheme page as System Admin
diff --git a/e2e/cypress/integration/system_console/plugin_upload_spec.js b/e2e/cypress/integration/system_console/plugin_upload_spec.js
index cd8dab4e9285..7445103300e4 100644
--- a/e2e/cypress/integration/system_console/plugin_upload_spec.js
+++ b/e2e/cypress/integration/system_console/plugin_upload_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @system_console @plugin
 
 /**
diff --git a/e2e/cypress/integration/system_console/reporting/site_statistics_spec.js b/e2e/cypress/integration/system_console/reporting/site_statistics_spec.js
index 92b4e79349e9..74f327295658 100644
--- a/e2e/cypress/integration/system_console/reporting/site_statistics_spec.js
+++ b/e2e/cypress/integration/system_console/reporting/site_statistics_spec.js
@@ -6,6 +6,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @system_console
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/system_console/reporting/team_statistics_spec.js b/e2e/cypress/integration/system_console/reporting/team_statistics_spec.js
index 703891c34d92..f0653a92404a 100644
--- a/e2e/cypress/integration/system_console/reporting/team_statistics_spec.js
+++ b/e2e/cypress/integration/system_console/reporting/team_statistics_spec.js
@@ -6,6 +6,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @system_console
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/system_console/search_box_spec.js b/e2e/cypress/integration/system_console/search_box_spec.js
index f22c71198c70..e80d407cd56a 100644
--- a/e2e/cypress/integration/system_console/search_box_spec.js
+++ b/e2e/cypress/integration/system_console/search_box_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @system_console
 
 import * as TIMEOUTS from '../../fixtures/timeouts';
diff --git a/e2e/cypress/integration/system_console/unsaved_changes_spec.js b/e2e/cypress/integration/system_console/unsaved_changes_spec.js
index aa45581db53b..0a3f22a2f4de 100644
--- a/e2e/cypress/integration/system_console/unsaved_changes_spec.js
+++ b/e2e/cypress/integration/system_console/unsaved_changes_spec.js
@@ -7,6 +7,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @system_console
 
 describe('Unsaved Changes', () => {
diff --git a/e2e/cypress/integration/team_settings/closed_team_invite_with_non_mattermost_domain_spec.js b/e2e/cypress/integration/team_settings/closed_team_invite_with_non_mattermost_domain_spec.js
index 33ecd5f2d510..5bad162ecf22 100644
--- a/e2e/cypress/integration/team_settings/closed_team_invite_with_non_mattermost_domain_spec.js
+++ b/e2e/cypress/integration/team_settings/closed_team_invite_with_non_mattermost_domain_spec.js
@@ -8,6 +8,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @team_settings
 
 import {generateRandomUser} from '../../support/api/user';
diff --git a/e2e/cypress/integration/team_settings/closed_team_invite_with_specific_domain_spec.js b/e2e/cypress/integration/team_settings/closed_team_invite_with_specific_domain_spec.js
index 48d188f530fc..d13b435981ce 100644
--- a/e2e/cypress/integration/team_settings/closed_team_invite_with_specific_domain_spec.js
+++ b/e2e/cypress/integration/team_settings/closed_team_invite_with_specific_domain_spec.js
@@ -8,6 +8,7 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
+// Stage: @prod
 // Group: @team_settings
 
 import {generateRandomUser} from '../../support/api/user';