From 572584937c0a0fe0a6484e05a7a280ce09fd7018 Mon Sep 17 00:00:00 2001
From: Mario Vitale <mvitale1989@hotmail.com>
Date: Tue, 12 Nov 2024 12:04:32 +0100
Subject: [PATCH] Demote unstable tests from daily run (#29147)

* Demote unstable tests from daily run

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
---
 e2e-tests/cypress/.eslintrc.json                              | 2 +-
 .../channels/account_settings/security/password_spec.ts       | 2 +-
 .../integration/channels/archived_channel/post_menu_spec.ts   | 2 +-
 .../tests/integration/channels/bot_accounts/bot_api_1_spec.ts | 2 +-
 .../channels/enterprise/metrics/license_no_license_spec.js    | 1 -
 .../tests/integration/channels/enterprise/oauth/oauth_spec.ts | 2 +-
 .../integrations/message_to_channel_via_slash_command_spec.js | 1 -
 .../channels/keyboard_shortcuts/keyboard_shortcuts_1_spec.js  | 4 ++--
 .../channels/mark_as_unread/bot_post_mark_as_unread_spec.js   | 1 -
 .../channels/mark_as_unread/toast_appears_unread_spec.js      | 1 -
 .../channels/mark_as_unread/unread_toast_count_spec.js        | 1 -
 .../messaging/autocomplete_shown_each_channel_spec.js         | 1 -
 .../messaging/message_draft_then_switch_channel_spec.js       | 1 -
 .../channels/messaging/message_reply_part2_spec.js            | 1 -
 .../channels/messaging/permalink_loading_indicator_spec.js    | 1 -
 .../integration/channels/plugins/demo_plugin/webhook_spec.js  | 1 -
 .../integration/channels/plugins/plugin_startup_fail_spec.js  | 1 -
 .../tests/integration/channels/search/clear_input_spec.js     | 1 -
 .../tests/integration/channels/search_filter/input_spec.js    | 4 ++--
 .../site_configuration/link_customization_e20_1_spec.js       | 1 -
 .../site_configuration/link_customization_e20_2_spec.js       | 1 -
 .../system_console/ui_and_api/customization_not_cloud_spec.js | 1 -
 .../channels/toast/unread_with_bottom_start_toast_spec.js     | 1 -
 .../integration/channels/websocket/handle_new_post_spec.js    | 4 ++--
 .../integration/playbooks/channels/rhs/status_update_spec.js  | 2 --
 e2e-tests/cypress/tests/integration/playbooks/lhs_spec.js     | 2 --
 .../integration/playbooks/playbooks/edit/actions_spec.js      | 2 --
 .../integration/playbooks/playbooks/edit/checklists_spec.js   | 2 --
 .../tests/integration/playbooks/playbooks/edit/header_spec.js | 2 --
 .../integration/playbooks/playbooks/edit_metrics_spec.js      | 2 --
 .../tests/integration/playbooks/runs/permissions_spec.js      | 2 --
 .../tests/integration/playbooks/runs/rdp_main_header_spec.js  | 2 --
 .../integration/playbooks/runs/rdp_main_statusupdate_spec.js  | 2 --
 .../system_console/system_users/export_data.spec.ts           | 2 +-
 34 files changed, 12 insertions(+), 46 deletions(-)

diff --git a/e2e-tests/cypress/.eslintrc.json b/e2e-tests/cypress/.eslintrc.json
index 1d23c33cfc..9536debf78 100644
--- a/e2e-tests/cypress/.eslintrc.json
+++ b/e2e-tests/cypress/.eslintrc.json
@@ -62,7 +62,7 @@
         ]
       }
     ],
-    "no-only-tests/no-only-tests": ["error", {"focus": ["only", "skip"]}],
+    "no-only-tests/no-only-tests": ["error", {"focus": ["only"]}],
     "max-lines": ["warn", {"max": 800, "skipBlankLines": true, "skipComments": true}]
   },
   "overrides": [
diff --git a/e2e-tests/cypress/tests/integration/channels/account_settings/security/password_spec.ts b/e2e-tests/cypress/tests/integration/channels/account_settings/security/password_spec.ts
index 1444117535..ff939820b6 100644
--- a/e2e-tests/cypress/tests/integration/channels/account_settings/security/password_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/account_settings/security/password_spec.ts
@@ -110,7 +110,7 @@ describe('Profile', () => {
         cy.get('#channelHeaderTitle').should('contain', 'Off-Topic');
     });
 
-    it('MM-T2086 Password: Timestamp and email', () => {
+    it.skip('MM-T2086 Password: Timestamp and email', () => {
         // # Enter valid values in password change fields
         enterPasswords(testUser.password, 'passwd', 'passwd');
 
diff --git a/e2e-tests/cypress/tests/integration/channels/archived_channel/post_menu_spec.ts b/e2e-tests/cypress/tests/integration/channels/archived_channel/post_menu_spec.ts
index ac99bea62d..8dc08ac77b 100644
--- a/e2e-tests/cypress/tests/integration/channels/archived_channel/post_menu_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/archived_channel/post_menu_spec.ts
@@ -24,7 +24,7 @@ describe('Archived channels', () => {
         });
     });
 
-    it('MM-T1721 Archive channel posts menu should have copy link and reply options', () => {
+    it.skip('MM-T1721 Archive channel posts menu should have copy link and reply options', () => {
         // # Click to add a channel description
         //   Note that it is invisible until the mouse hovers it, which is unfeasible in Cypress
         //   https://docs.cypress.io/api/commands/hover
diff --git a/e2e-tests/cypress/tests/integration/channels/bot_accounts/bot_api_1_spec.ts b/e2e-tests/cypress/tests/integration/channels/bot_accounts/bot_api_1_spec.ts
index 021635cf58..65effadc77 100644
--- a/e2e-tests/cypress/tests/integration/channels/bot_accounts/bot_api_1_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/bot_accounts/bot_api_1_spec.ts
@@ -114,7 +114,7 @@ describe('Bot accounts ownership and API', () => {
         });
     });
 
-    it('MM-T1866 Create two posts in a row to the same channel', () => {
+    it.skip('MM-T1866 Create two posts in a row to the same channel', () => {
         // # Create token for the bot
         cy.apiCreateToken(botId).then(({token}) => {
             // # Logout to allow posting as bot
diff --git a/e2e-tests/cypress/tests/integration/channels/enterprise/metrics/license_no_license_spec.js b/e2e-tests/cypress/tests/integration/channels/enterprise/metrics/license_no_license_spec.js
index 4611e800a7..95f1070544 100644
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/metrics/license_no_license_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/metrics/license_no_license_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @enterprise @metrics @not_cloud @license_removal
 
 import {checkMetrics, toggleMetricsOn} from './helper';
diff --git a/e2e-tests/cypress/tests/integration/channels/enterprise/oauth/oauth_spec.ts b/e2e-tests/cypress/tests/integration/channels/enterprise/oauth/oauth_spec.ts
index 2a65222f91..dc2a5f517b 100644
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/oauth/oauth_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/oauth/oauth_spec.ts
@@ -402,7 +402,7 @@ describe('Integrations page', () => {
         cy.contains('Invalid client credentials.').should('exist');
     });
 
-    it('MM-T654 Successful reconnect with updated secret', () => {
+    it.skip('MM-T654 Successful reconnect with updated secret', () => {
         cy.apiAdminLogin();
 
         // # Send new credentials
diff --git a/e2e-tests/cypress/tests/integration/channels/integrations/message_to_channel_via_slash_command_spec.js b/e2e-tests/cypress/tests/integration/channels/integrations/message_to_channel_via_slash_command_spec.js
index 516c9418bb..1f79818222 100644
--- a/e2e-tests/cypress/tests/integration/channels/integrations/message_to_channel_via_slash_command_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/integrations/message_to_channel_via_slash_command_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @integrations
 
 /**
diff --git a/e2e-tests/cypress/tests/integration/channels/keyboard_shortcuts/keyboard_shortcuts_1_spec.js b/e2e-tests/cypress/tests/integration/channels/keyboard_shortcuts/keyboard_shortcuts_1_spec.js
index 57c21bdd67..d096ff30e5 100644
--- a/e2e-tests/cypress/tests/integration/channels/keyboard_shortcuts/keyboard_shortcuts_1_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/keyboard_shortcuts/keyboard_shortcuts_1_spec.js
@@ -69,7 +69,7 @@ describe('Keyboard Shortcuts', () => {
         });
     });
 
-    it('MM-T1231 - ALT+SHIFT+UP', () => {
+    it.skip('MM-T1231 - ALT+SHIFT+UP', () => {
         cy.apiLogout();
         cy.apiLogin(testUser);
 
@@ -212,7 +212,7 @@ describe('Keyboard Shortcuts', () => {
         });
     });
 
-    it('MM-T1232 - ALT+SHIFT+DOWN', () => {
+    it.skip('MM-T1232 - ALT+SHIFT+DOWN', () => {
         cy.apiLogout();
         cy.apiLogin(testUser);
 
diff --git a/e2e-tests/cypress/tests/integration/channels/mark_as_unread/bot_post_mark_as_unread_spec.js b/e2e-tests/cypress/tests/integration/channels/mark_as_unread/bot_post_mark_as_unread_spec.js
index 23c53c7b3d..f0f202bd4c 100644
--- a/e2e-tests/cypress/tests/integration/channels/mark_as_unread/bot_post_mark_as_unread_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/mark_as_unread/bot_post_mark_as_unread_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @mark_as_unread
 
 import {beUnread} from '../../../support/assertions';
diff --git a/e2e-tests/cypress/tests/integration/channels/mark_as_unread/toast_appears_unread_spec.js b/e2e-tests/cypress/tests/integration/channels/mark_as_unread/toast_appears_unread_spec.js
index 96ce636bbd..578932da62 100644
--- a/e2e-tests/cypress/tests/integration/channels/mark_as_unread/toast_appears_unread_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/mark_as_unread/toast_appears_unread_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @mark_as_unread
 
 import {markAsUnreadFromPost, switchToChannel} from './helpers';
diff --git a/e2e-tests/cypress/tests/integration/channels/mark_as_unread/unread_toast_count_spec.js b/e2e-tests/cypress/tests/integration/channels/mark_as_unread/unread_toast_count_spec.js
index 871d9f4aef..fdcaab40e3 100644
--- a/e2e-tests/cypress/tests/integration/channels/mark_as_unread/unread_toast_count_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/mark_as_unread/unread_toast_count_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @mark_as_unread
 
 describe('Verify unread toast appears after repeated manual marking post as unread', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/autocomplete_shown_each_channel_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/autocomplete_shown_each_channel_spec.js
index 358b2087a7..d6ef4bea46 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/autocomplete_shown_each_channel_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/autocomplete_shown_each_channel_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging
 
 describe('Identical Message Drafts', () => {
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/message_draft_then_switch_channel_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/message_draft_then_switch_channel_spec.js
index 9fabc7ad48..f44baa8aed 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/message_draft_then_switch_channel_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/message_draft_then_switch_channel_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging
 
 import {verifyDraftIcon} from './helpers';
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/message_reply_part2_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/message_reply_part2_spec.js
index 8482470f69..f7cf3aeea0 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/message_reply_part2_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/message_reply_part2_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging
 
 const TIMEOUTS = require('../../../fixtures/timeouts');
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/permalink_loading_indicator_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/permalink_loading_indicator_spec.js
index ab2f45d4fb..67ed9538ea 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/permalink_loading_indicator_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/permalink_loading_indicator_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging
 
 import {getRandomId} from '../../../utils';
diff --git a/e2e-tests/cypress/tests/integration/channels/plugins/demo_plugin/webhook_spec.js b/e2e-tests/cypress/tests/integration/channels/plugins/demo_plugin/webhook_spec.js
index d660e527e7..0b0e3ebf64 100644
--- a/e2e-tests/cypress/tests/integration/channels/plugins/demo_plugin/webhook_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/plugins/demo_plugin/webhook_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @plugin @not_cloud
 
 import * as TIMEOUTS from '../../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/plugins/plugin_startup_fail_spec.js b/e2e-tests/cypress/tests/integration/channels/plugins/plugin_startup_fail_spec.js
index 09919bd861..9c7fb72245 100644
--- a/e2e-tests/cypress/tests/integration/channels/plugins/plugin_startup_fail_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/plugins/plugin_startup_fail_spec.js
@@ -14,7 +14,6 @@
  * under fixtures folder.
  */
 
-// Stage: @prod
 // Group: @channels @system_console @plugin @not_cloud @timeout_error
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/search/clear_input_spec.js b/e2e-tests/cypress/tests/integration/channels/search/clear_input_spec.js
index dca1a45ee7..a9e17d2118 100644
--- a/e2e-tests/cypress/tests/integration/channels/search/clear_input_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/search/clear_input_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @search
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/search_filter/input_spec.js b/e2e-tests/cypress/tests/integration/channels/search_filter/input_spec.js
index 0e2a37ad63..ab49e2534e 100644
--- a/e2e-tests/cypress/tests/integration/channels/search_filter/input_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/search_filter/input_spec.js
@@ -49,7 +49,7 @@ describe('Search Date Filter', () => {
         searchAndValidate(todayMessage, [todayMessage]);
     });
 
-    it('MM-T596 Use calendar picker to set date', () => {
+    it.skip('MM-T596 Use calendar picker to set date', () => {
         const today = Cypress.dayjs().format('YYYY-MM-DD');
 
         // # Type before: in search field
@@ -79,7 +79,7 @@ describe('Search Date Filter', () => {
         cy.uiGetSearchContainer().should('be.visible').click();
     });
 
-    it('MM-T3997 Backspace after last character of filter makes calendar reappear', () => {
+    it.skip('MM-T3997 Backspace after last character of filter makes calendar reappear', () => {
         const today = Cypress.dayjs().format('YYYY-MM-DD');
 
         // # Type before: in search field
diff --git a/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/link_customization_e20_1_spec.js b/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/link_customization_e20_1_spec.js
index 991893f298..5ad2a9dedc 100644
--- a/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/link_customization_e20_1_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/link_customization_e20_1_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @system_console @enterprise @e20_only @not_cloud
 
 import * as TIMEOUTS from '../../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/link_customization_e20_2_spec.js b/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/link_customization_e20_2_spec.js
index 79c6122f6b..aa65accb47 100644
--- a/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/link_customization_e20_2_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/link_customization_e20_2_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @not_cloud @system_console
 
 import {
diff --git a/e2e-tests/cypress/tests/integration/channels/system_console/ui_and_api/customization_not_cloud_spec.js b/e2e-tests/cypress/tests/integration/channels/system_console/ui_and_api/customization_not_cloud_spec.js
index cd17c86936..8b2fdd5acb 100644
--- a/e2e-tests/cypress/tests/integration/channels/system_console/ui_and_api/customization_not_cloud_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/system_console/ui_and_api/customization_not_cloud_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @not_cloud @system_console
 
 import * as TIMEOUTS from '../../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/toast/unread_with_bottom_start_toast_spec.js b/e2e-tests/cypress/tests/integration/channels/toast/unread_with_bottom_start_toast_spec.js
index 84637a562a..dd69b1c830 100644
--- a/e2e-tests/cypress/tests/integration/channels/toast/unread_with_bottom_start_toast_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/toast/unread_with_bottom_start_toast_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @toast
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
diff --git a/e2e-tests/cypress/tests/integration/channels/websocket/handle_new_post_spec.js b/e2e-tests/cypress/tests/integration/channels/websocket/handle_new_post_spec.js
index ad0d796115..c485f10819 100644
--- a/e2e-tests/cypress/tests/integration/channels/websocket/handle_new_post_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/websocket/handle_new_post_spec.js
@@ -32,7 +32,7 @@ describe('Handle new post', () => {
         });
     });
 
-    it('MM-T4609 - should mark channel as unread when a message is sent in another channel', () => {
+    it.skip('MM-T4609 - should mark channel as unread when a message is sent in another channel', () => {
         // # Explicitly click over to the test channel from Town Square
         // # to dismiss the unread + badge from adding `user` to the channel
         cy.get(`#sidebarItem_${channel1.name}`).click();
@@ -52,7 +52,7 @@ describe('Handle new post', () => {
         cy.get(`#sidebarItem_${channel1.name} .badge`).should('not.exist');
     });
 
-    it('MM-T4610 - should show the mention badge when a mention is sent in another channel', () => {
+    it.skip('MM-T4610 - should show the mention badge when a mention is sent in another channel', () => {
         // # Explicitly click over to the test channel from Town Square
         // # to dismiss the unread + badge from the end of the previous test
         // # (maybe should use a new channel but then the same thing has to be done
diff --git a/e2e-tests/cypress/tests/integration/playbooks/channels/rhs/status_update_spec.js b/e2e-tests/cypress/tests/integration/playbooks/channels/rhs/status_update_spec.js
index 050a0562d6..1467ab4b8c 100644
--- a/e2e-tests/cypress/tests/integration/playbooks/channels/rhs/status_update_spec.js
+++ b/e2e-tests/cypress/tests/integration/playbooks/channels/rhs/status_update_spec.js
@@ -8,8 +8,6 @@
 
 // Group: @playbooks
 
-/* eslint-disable no-only-tests/no-only-tests */
-
 import * as TIMEOUTS from '../../../../fixtures/timeouts';
 
 describe('channels > rhs > status update', {testIsolation: true}, () => {
diff --git a/e2e-tests/cypress/tests/integration/playbooks/lhs_spec.js b/e2e-tests/cypress/tests/integration/playbooks/lhs_spec.js
index 1a74d96bf8..b3a8879946 100644
--- a/e2e-tests/cypress/tests/integration/playbooks/lhs_spec.js
+++ b/e2e-tests/cypress/tests/integration/playbooks/lhs_spec.js
@@ -9,8 +9,6 @@
 // Stage: @prod
 // Group: @playbooks
 
-/* eslint-disable no-only-tests/no-only-tests */
-
 import {HALF_SEC} from '../../fixtures/timeouts';
 import {stubClipboard} from '../../utils';
 
diff --git a/e2e-tests/cypress/tests/integration/playbooks/playbooks/edit/actions_spec.js b/e2e-tests/cypress/tests/integration/playbooks/playbooks/edit/actions_spec.js
index 76c20c30a5..8f75ce0b0c 100644
--- a/e2e-tests/cypress/tests/integration/playbooks/playbooks/edit/actions_spec.js
+++ b/e2e-tests/cypress/tests/integration/playbooks/playbooks/edit/actions_spec.js
@@ -9,8 +9,6 @@
 // Stage: @prod
 // Group: @playbooks
 
-/* eslint-disable no-only-tests/no-only-tests */
-
 import * as TIMEOUTS from '../../../../fixtures/timeouts';
 
 // assumes that E20 license is uploaded
diff --git a/e2e-tests/cypress/tests/integration/playbooks/playbooks/edit/checklists_spec.js b/e2e-tests/cypress/tests/integration/playbooks/playbooks/edit/checklists_spec.js
index f894a5e68d..06b1d8cb85 100644
--- a/e2e-tests/cypress/tests/integration/playbooks/playbooks/edit/checklists_spec.js
+++ b/e2e-tests/cypress/tests/integration/playbooks/playbooks/edit/checklists_spec.js
@@ -9,8 +9,6 @@
 // Stage: @prod
 // Group: @playbooks
 
-/* eslint-disable no-only-tests/no-only-tests */
-
 describe('playbooks > edit', {testIsolation: true}, () => {
     let testUser;
 
diff --git a/e2e-tests/cypress/tests/integration/playbooks/playbooks/edit/header_spec.js b/e2e-tests/cypress/tests/integration/playbooks/playbooks/edit/header_spec.js
index cf4643739e..22d4342b56 100644
--- a/e2e-tests/cypress/tests/integration/playbooks/playbooks/edit/header_spec.js
+++ b/e2e-tests/cypress/tests/integration/playbooks/playbooks/edit/header_spec.js
@@ -9,8 +9,6 @@
 // Stage: @prod
 // Group: @playbooks
 
-/* eslint-disable no-only-tests/no-only-tests */
-
 describe('playbooks > edit', {testIsolation: true}, () => {
     let testTeam;
     let testUser;
diff --git a/e2e-tests/cypress/tests/integration/playbooks/playbooks/edit_metrics_spec.js b/e2e-tests/cypress/tests/integration/playbooks/playbooks/edit_metrics_spec.js
index 0180c42a73..46c696fc43 100644
--- a/e2e-tests/cypress/tests/integration/playbooks/playbooks/edit_metrics_spec.js
+++ b/e2e-tests/cypress/tests/integration/playbooks/playbooks/edit_metrics_spec.js
@@ -9,8 +9,6 @@
 // Stage: @prod
 // Group: @playbooks
 
-/* eslint-disable no-only-tests/no-only-tests */
-
 describe('playbooks > edit_metrics', {testIsolation: true}, () => {
     let testTeam;
     let testUser;
diff --git a/e2e-tests/cypress/tests/integration/playbooks/runs/permissions_spec.js b/e2e-tests/cypress/tests/integration/playbooks/runs/permissions_spec.js
index 594487de28..734d739eb0 100644
--- a/e2e-tests/cypress/tests/integration/playbooks/runs/permissions_spec.js
+++ b/e2e-tests/cypress/tests/integration/playbooks/runs/permissions_spec.js
@@ -9,8 +9,6 @@
 // Stage: @prod
 // Group: @playbooks
 
-/* eslint-disable no-only-tests/no-only-tests */
-
 import {getRandomId} from '../../../utils';
 
 describe('runs > permissions', {testIsolation: true}, () => {
diff --git a/e2e-tests/cypress/tests/integration/playbooks/runs/rdp_main_header_spec.js b/e2e-tests/cypress/tests/integration/playbooks/runs/rdp_main_header_spec.js
index 28e26e3a02..aa4814cc48 100644
--- a/e2e-tests/cypress/tests/integration/playbooks/runs/rdp_main_header_spec.js
+++ b/e2e-tests/cypress/tests/integration/playbooks/runs/rdp_main_header_spec.js
@@ -9,8 +9,6 @@
 // Stage: @prod
 // Group: @playbooks
 
-/* eslint-disable no-only-tests/no-only-tests */
-
 import {stubClipboard} from '../../../utils';
 
 describe('runs > run details page > header', {testIsolation: true}, () => {
diff --git a/e2e-tests/cypress/tests/integration/playbooks/runs/rdp_main_statusupdate_spec.js b/e2e-tests/cypress/tests/integration/playbooks/runs/rdp_main_statusupdate_spec.js
index fddc55378b..b384e659a1 100644
--- a/e2e-tests/cypress/tests/integration/playbooks/runs/rdp_main_statusupdate_spec.js
+++ b/e2e-tests/cypress/tests/integration/playbooks/runs/rdp_main_statusupdate_spec.js
@@ -9,8 +9,6 @@
 // Stage: @prod
 // Group: @playbooks
 
-/* eslint-disable no-only-tests/no-only-tests */
-
 describe('runs > run details page > status update', {testIsolation: true}, () => {
     let testTeam;
     let testUser;
diff --git a/e2e-tests/playwright/tests/functional/system_console/system_users/export_data.spec.ts b/e2e-tests/playwright/tests/functional/system_console/system_users/export_data.spec.ts
index a47352f474..af4ae53533 100644
--- a/e2e-tests/playwright/tests/functional/system_console/system_users/export_data.spec.ts
+++ b/e2e-tests/playwright/tests/functional/system_console/system_users/export_data.spec.ts
@@ -7,7 +7,7 @@ import {test} from '@e2e-support/test_fixture';
 import {duration} from '@e2e-support/util';
 import {components} from '@e2e-support/ui/components';
 
-test('MM-T5522 Should begin export of data when export button is pressed', async ({pw, pages}) => {
+test.fixme('MM-T5522 Should begin export of data when export button is pressed', async ({pw, pages}) => {
     test.slow();
 
     // # Skip test if no license