From 0645e6eaa1ba8cc7f50ba80921a4ab34a9d3d8b1 Mon Sep 17 00:00:00 2001
From: Julia Rechkunova <julia.rechkunova@elastic.co>
Date: Thu, 4 Apr 2024 15:47:07 +0200
Subject: [PATCH 1/3] [Discover] Split functional tests in more groups

---
 .buildkite/ftr_configs.yml                    |  8 ++++-
 test/functional/apps/discover/group1/index.ts | 10 ------
 .../_data_grid.ts                             |  0
 .../_data_grid_context.ts                     |  0
 .../_data_grid_copy_to_clipboard.ts           |  0
 .../_data_grid_doc_navigation.ts              |  0
 .../_data_grid_doc_table.ts                   |  0
 .../{group2 => group2_data_grid1}/config.ts   |  0
 .../{group2 => group2_data_grid1}/index.ts    | 10 +-----
 .../_data_grid_field_data.ts                  |  0
 .../_data_grid_field_tokens.ts                |  0
 .../_data_grid_footer.ts                      |  0
 .../_data_grid_new_line.ts                    |  0
 .../apps/discover/group2_data_grid2/config.ts | 18 ++++++++++
 .../apps/discover/group2_data_grid2/index.ts  | 28 +++++++++++++++
 .../_data_grid_pagination.ts                  |  0
 .../_data_grid_row_height.ts                  |  0
 .../_data_grid_row_navigation.ts              |  0
 .../_data_grid_sample_size.ts                 |  0
 .../apps/discover/group2_data_grid3/config.ts | 18 ++++++++++
 .../apps/discover/group2_data_grid3/index.ts  | 28 +++++++++++++++
 test/functional/apps/discover/group3/index.ts |  5 ---
 test/functional/apps/discover/group4/index.ts |  8 -----
 .../{group1 => group5}/_field_data.ts         |  0
 .../_field_data_with_fields_api.ts            |  0
 .../{group1 => group5}/_filter_editor.ts      |  0
 .../{group1 => group5}/_greeting_screen.ts    |  0
 .../discover/{group1 => group5}/_inspector.ts |  0
 .../{group1 => group5}/_large_string.ts       |  0
 .../discover/{group1 => group5}/_no_data.ts   |  0
 .../{group1 => group5}/_shared_links.ts       |  0
 .../{group1 => group5}/_source_filters.ts     |  0
 .../discover/{group1 => group5}/_url_state.ts |  0
 .../functional/apps/discover/group5/config.ts | 18 ++++++++++
 test/functional/apps/discover/group5/index.ts | 34 +++++++++++++++++++
 .../discover/{group3 => group6}/_sidebar.ts   |  0
 .../_sidebar_field_stats.ts                   |  0
 .../{group3 => group6}/_time_field_column.ts  |  0
 .../_unsaved_changes_badge.ts                 |  0
 .../{group3 => group6}/_view_mode_toggle.ts   |  0
 .../functional/apps/discover/group6/config.ts | 18 ++++++++++
 test/functional/apps/discover/group6/index.ts | 29 ++++++++++++++++
 .../{group4 => group7}/_huge_fields.ts        |  0
 .../_indexpattern_with_unmapped_fields.ts     |  0
 .../_indexpattern_without_timefield.ts        |  0
 .../{group4 => group7}/_new_search.ts         |  0
 .../_request_cancellation.ts                  |  0
 .../_runtime_fields_editor.ts                 |  0
 .../_search_on_page_load.ts                   |  0
 .../functional/apps/discover/group7/config.ts | 18 ++++++++++
 test/functional/apps/discover/group7/index.ts | 31 +++++++++++++++++
 .../{group4 => group8}/_hide_announcements.ts |  0
 .../functional/apps/discover/group8/config.ts | 18 ++++++++++
 test/functional/apps/discover/group8/index.ts | 25 ++++++++++++++
 test/functional/firefox/discover.config.ts    |  4 ++-
 55 files changed, 294 insertions(+), 34 deletions(-)
 rename test/functional/apps/discover/{group2 => group2_data_grid1}/_data_grid.ts (100%)
 rename test/functional/apps/discover/{group2 => group2_data_grid1}/_data_grid_context.ts (100%)
 rename test/functional/apps/discover/{group2 => group2_data_grid1}/_data_grid_copy_to_clipboard.ts (100%)
 rename test/functional/apps/discover/{group2 => group2_data_grid1}/_data_grid_doc_navigation.ts (100%)
 rename test/functional/apps/discover/{group2 => group2_data_grid1}/_data_grid_doc_table.ts (100%)
 rename test/functional/apps/discover/{group2 => group2_data_grid1}/config.ts (100%)
 rename test/functional/apps/discover/{group2 => group2_data_grid1}/index.ts (67%)
 rename test/functional/apps/discover/{group2 => group2_data_grid2}/_data_grid_field_data.ts (100%)
 rename test/functional/apps/discover/{group2 => group2_data_grid2}/_data_grid_field_tokens.ts (100%)
 rename test/functional/apps/discover/{group2 => group2_data_grid2}/_data_grid_footer.ts (100%)
 rename test/functional/apps/discover/{group2 => group2_data_grid2}/_data_grid_new_line.ts (100%)
 create mode 100644 test/functional/apps/discover/group2_data_grid2/config.ts
 create mode 100644 test/functional/apps/discover/group2_data_grid2/index.ts
 rename test/functional/apps/discover/{group2 => group2_data_grid3}/_data_grid_pagination.ts (100%)
 rename test/functional/apps/discover/{group2 => group2_data_grid3}/_data_grid_row_height.ts (100%)
 rename test/functional/apps/discover/{group2 => group2_data_grid3}/_data_grid_row_navigation.ts (100%)
 rename test/functional/apps/discover/{group2 => group2_data_grid3}/_data_grid_sample_size.ts (100%)
 create mode 100644 test/functional/apps/discover/group2_data_grid3/config.ts
 create mode 100644 test/functional/apps/discover/group2_data_grid3/index.ts
 rename test/functional/apps/discover/{group1 => group5}/_field_data.ts (100%)
 rename test/functional/apps/discover/{group1 => group5}/_field_data_with_fields_api.ts (100%)
 rename test/functional/apps/discover/{group1 => group5}/_filter_editor.ts (100%)
 rename test/functional/apps/discover/{group1 => group5}/_greeting_screen.ts (100%)
 rename test/functional/apps/discover/{group1 => group5}/_inspector.ts (100%)
 rename test/functional/apps/discover/{group1 => group5}/_large_string.ts (100%)
 rename test/functional/apps/discover/{group1 => group5}/_no_data.ts (100%)
 rename test/functional/apps/discover/{group1 => group5}/_shared_links.ts (100%)
 rename test/functional/apps/discover/{group1 => group5}/_source_filters.ts (100%)
 rename test/functional/apps/discover/{group1 => group5}/_url_state.ts (100%)
 create mode 100644 test/functional/apps/discover/group5/config.ts
 create mode 100644 test/functional/apps/discover/group5/index.ts
 rename test/functional/apps/discover/{group3 => group6}/_sidebar.ts (100%)
 rename test/functional/apps/discover/{group3 => group6}/_sidebar_field_stats.ts (100%)
 rename test/functional/apps/discover/{group3 => group6}/_time_field_column.ts (100%)
 rename test/functional/apps/discover/{group3 => group6}/_unsaved_changes_badge.ts (100%)
 rename test/functional/apps/discover/{group3 => group6}/_view_mode_toggle.ts (100%)
 create mode 100644 test/functional/apps/discover/group6/config.ts
 create mode 100644 test/functional/apps/discover/group6/index.ts
 rename test/functional/apps/discover/{group4 => group7}/_huge_fields.ts (100%)
 rename test/functional/apps/discover/{group4 => group7}/_indexpattern_with_unmapped_fields.ts (100%)
 rename test/functional/apps/discover/{group4 => group7}/_indexpattern_without_timefield.ts (100%)
 rename test/functional/apps/discover/{group4 => group7}/_new_search.ts (100%)
 rename test/functional/apps/discover/{group4 => group7}/_request_cancellation.ts (100%)
 rename test/functional/apps/discover/{group4 => group7}/_runtime_fields_editor.ts (100%)
 rename test/functional/apps/discover/{group4 => group7}/_search_on_page_load.ts (100%)
 create mode 100644 test/functional/apps/discover/group7/config.ts
 create mode 100644 test/functional/apps/discover/group7/index.ts
 rename test/functional/apps/discover/{group4 => group8}/_hide_announcements.ts (100%)
 create mode 100644 test/functional/apps/discover/group8/config.ts
 create mode 100644 test/functional/apps/discover/group8/index.ts

diff --git a/.buildkite/ftr_configs.yml b/.buildkite/ftr_configs.yml
index ee6bb5ca8ffc1..f1758268c6fe1 100644
--- a/.buildkite/ftr_configs.yml
+++ b/.buildkite/ftr_configs.yml
@@ -115,9 +115,15 @@ enabled:
   - test/functional/apps/discover/classic/config.ts
   - test/functional/apps/discover/embeddable/config.ts
   - test/functional/apps/discover/group1/config.ts
-  - test/functional/apps/discover/group2/config.ts
+  - test/functional/apps/discover/group2_data_grid1/config.ts
+  - test/functional/apps/discover/group2_data_grid2/config.ts
+  - test/functional/apps/discover/group2_data_grid3/config.ts
   - test/functional/apps/discover/group3/config.ts
   - test/functional/apps/discover/group4/config.ts
+  - test/functional/apps/discover/group5/config.ts
+  - test/functional/apps/discover/group6/config.ts
+  - test/functional/apps/discover/group7/config.ts
+  - test/functional/apps/discover/group8/config.ts
   - test/functional/apps/getting_started/config.ts
   - test/functional/apps/home/config.ts
   - test/functional/apps/kibana_overview/config.ts
diff --git a/test/functional/apps/discover/group1/index.ts b/test/functional/apps/discover/group1/index.ts
index 375954797c3ca..2ca6413a11c22 100644
--- a/test/functional/apps/discover/group1/index.ts
+++ b/test/functional/apps/discover/group1/index.ts
@@ -20,23 +20,13 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
       await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
     });
 
-    loadTestFile(require.resolve('./_no_data'));
     loadTestFile(require.resolve('./_discover'));
     loadTestFile(require.resolve('./_discover_accessibility'));
     loadTestFile(require.resolve('./_discover_histogram_breakdown'));
     loadTestFile(require.resolve('./_discover_histogram'));
     loadTestFile(require.resolve('./_doc_accessibility'));
-    loadTestFile(require.resolve('./_filter_editor'));
     loadTestFile(require.resolve('./_errors'));
-    loadTestFile(require.resolve('./_field_data'));
-    loadTestFile(require.resolve('./_field_data_with_fields_api'));
-    loadTestFile(require.resolve('./_shared_links'));
-    loadTestFile(require.resolve('./_source_filters'));
-    loadTestFile(require.resolve('./_large_string'));
-    loadTestFile(require.resolve('./_greeting_screen'));
-    loadTestFile(require.resolve('./_inspector'));
     loadTestFile(require.resolve('./_date_nanos'));
     loadTestFile(require.resolve('./_date_nanos_mixed'));
-    loadTestFile(require.resolve('./_url_state'));
   });
 }
diff --git a/test/functional/apps/discover/group2/_data_grid.ts b/test/functional/apps/discover/group2_data_grid1/_data_grid.ts
similarity index 100%
rename from test/functional/apps/discover/group2/_data_grid.ts
rename to test/functional/apps/discover/group2_data_grid1/_data_grid.ts
diff --git a/test/functional/apps/discover/group2/_data_grid_context.ts b/test/functional/apps/discover/group2_data_grid1/_data_grid_context.ts
similarity index 100%
rename from test/functional/apps/discover/group2/_data_grid_context.ts
rename to test/functional/apps/discover/group2_data_grid1/_data_grid_context.ts
diff --git a/test/functional/apps/discover/group2/_data_grid_copy_to_clipboard.ts b/test/functional/apps/discover/group2_data_grid1/_data_grid_copy_to_clipboard.ts
similarity index 100%
rename from test/functional/apps/discover/group2/_data_grid_copy_to_clipboard.ts
rename to test/functional/apps/discover/group2_data_grid1/_data_grid_copy_to_clipboard.ts
diff --git a/test/functional/apps/discover/group2/_data_grid_doc_navigation.ts b/test/functional/apps/discover/group2_data_grid1/_data_grid_doc_navigation.ts
similarity index 100%
rename from test/functional/apps/discover/group2/_data_grid_doc_navigation.ts
rename to test/functional/apps/discover/group2_data_grid1/_data_grid_doc_navigation.ts
diff --git a/test/functional/apps/discover/group2/_data_grid_doc_table.ts b/test/functional/apps/discover/group2_data_grid1/_data_grid_doc_table.ts
similarity index 100%
rename from test/functional/apps/discover/group2/_data_grid_doc_table.ts
rename to test/functional/apps/discover/group2_data_grid1/_data_grid_doc_table.ts
diff --git a/test/functional/apps/discover/group2/config.ts b/test/functional/apps/discover/group2_data_grid1/config.ts
similarity index 100%
rename from test/functional/apps/discover/group2/config.ts
rename to test/functional/apps/discover/group2_data_grid1/config.ts
diff --git a/test/functional/apps/discover/group2/index.ts b/test/functional/apps/discover/group2_data_grid1/index.ts
similarity index 67%
rename from test/functional/apps/discover/group2/index.ts
rename to test/functional/apps/discover/group2_data_grid1/index.ts
index 2639601e12c17..c9e9e9739337a 100644
--- a/test/functional/apps/discover/group2/index.ts
+++ b/test/functional/apps/discover/group2_data_grid1/index.ts
@@ -11,7 +11,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const browser = getService('browser');
 
-  describe('discover/group2', function () {
+  describe('discover/group2/data_grid1', function () {
     before(async function () {
       await browser.setWindowSize(1600, 1200);
     });
@@ -22,16 +22,8 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
 
     loadTestFile(require.resolve('./_data_grid'));
     loadTestFile(require.resolve('./_data_grid_context'));
-    loadTestFile(require.resolve('./_data_grid_field_data'));
     loadTestFile(require.resolve('./_data_grid_doc_navigation'));
-    loadTestFile(require.resolve('./_data_grid_row_navigation'));
     loadTestFile(require.resolve('./_data_grid_doc_table'));
     loadTestFile(require.resolve('./_data_grid_copy_to_clipboard'));
-    loadTestFile(require.resolve('./_data_grid_row_height'));
-    loadTestFile(require.resolve('./_data_grid_new_line'));
-    loadTestFile(require.resolve('./_data_grid_sample_size'));
-    loadTestFile(require.resolve('./_data_grid_pagination'));
-    loadTestFile(require.resolve('./_data_grid_footer'));
-    loadTestFile(require.resolve('./_data_grid_field_tokens'));
   });
 }
diff --git a/test/functional/apps/discover/group2/_data_grid_field_data.ts b/test/functional/apps/discover/group2_data_grid2/_data_grid_field_data.ts
similarity index 100%
rename from test/functional/apps/discover/group2/_data_grid_field_data.ts
rename to test/functional/apps/discover/group2_data_grid2/_data_grid_field_data.ts
diff --git a/test/functional/apps/discover/group2/_data_grid_field_tokens.ts b/test/functional/apps/discover/group2_data_grid2/_data_grid_field_tokens.ts
similarity index 100%
rename from test/functional/apps/discover/group2/_data_grid_field_tokens.ts
rename to test/functional/apps/discover/group2_data_grid2/_data_grid_field_tokens.ts
diff --git a/test/functional/apps/discover/group2/_data_grid_footer.ts b/test/functional/apps/discover/group2_data_grid2/_data_grid_footer.ts
similarity index 100%
rename from test/functional/apps/discover/group2/_data_grid_footer.ts
rename to test/functional/apps/discover/group2_data_grid2/_data_grid_footer.ts
diff --git a/test/functional/apps/discover/group2/_data_grid_new_line.ts b/test/functional/apps/discover/group2_data_grid2/_data_grid_new_line.ts
similarity index 100%
rename from test/functional/apps/discover/group2/_data_grid_new_line.ts
rename to test/functional/apps/discover/group2_data_grid2/_data_grid_new_line.ts
diff --git a/test/functional/apps/discover/group2_data_grid2/config.ts b/test/functional/apps/discover/group2_data_grid2/config.ts
new file mode 100644
index 0000000000000..a70a190ca63f8
--- /dev/null
+++ b/test/functional/apps/discover/group2_data_grid2/config.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { FtrConfigProviderContext } from '@kbn/test';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const functionalConfig = await readConfigFile(require.resolve('../../../config.base.js'));
+
+  return {
+    ...functionalConfig.getAll(),
+    testFiles: [require.resolve('.')],
+  };
+}
diff --git a/test/functional/apps/discover/group2_data_grid2/index.ts b/test/functional/apps/discover/group2_data_grid2/index.ts
new file mode 100644
index 0000000000000..1d3736cafe80b
--- /dev/null
+++ b/test/functional/apps/discover/group2_data_grid2/index.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function ({ getService, loadTestFile }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const browser = getService('browser');
+
+  describe('discover/group2/data_grid2', function () {
+    before(async function () {
+      await browser.setWindowSize(1600, 1200);
+    });
+
+    after(async function unloadMakelogs() {
+      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+    });
+
+    loadTestFile(require.resolve('./_data_grid_new_line'));
+    loadTestFile(require.resolve('./_data_grid_footer'));
+    loadTestFile(require.resolve('./_data_grid_field_data'));
+    loadTestFile(require.resolve('./_data_grid_field_tokens'));
+  });
+}
diff --git a/test/functional/apps/discover/group2/_data_grid_pagination.ts b/test/functional/apps/discover/group2_data_grid3/_data_grid_pagination.ts
similarity index 100%
rename from test/functional/apps/discover/group2/_data_grid_pagination.ts
rename to test/functional/apps/discover/group2_data_grid3/_data_grid_pagination.ts
diff --git a/test/functional/apps/discover/group2/_data_grid_row_height.ts b/test/functional/apps/discover/group2_data_grid3/_data_grid_row_height.ts
similarity index 100%
rename from test/functional/apps/discover/group2/_data_grid_row_height.ts
rename to test/functional/apps/discover/group2_data_grid3/_data_grid_row_height.ts
diff --git a/test/functional/apps/discover/group2/_data_grid_row_navigation.ts b/test/functional/apps/discover/group2_data_grid3/_data_grid_row_navigation.ts
similarity index 100%
rename from test/functional/apps/discover/group2/_data_grid_row_navigation.ts
rename to test/functional/apps/discover/group2_data_grid3/_data_grid_row_navigation.ts
diff --git a/test/functional/apps/discover/group2/_data_grid_sample_size.ts b/test/functional/apps/discover/group2_data_grid3/_data_grid_sample_size.ts
similarity index 100%
rename from test/functional/apps/discover/group2/_data_grid_sample_size.ts
rename to test/functional/apps/discover/group2_data_grid3/_data_grid_sample_size.ts
diff --git a/test/functional/apps/discover/group2_data_grid3/config.ts b/test/functional/apps/discover/group2_data_grid3/config.ts
new file mode 100644
index 0000000000000..a70a190ca63f8
--- /dev/null
+++ b/test/functional/apps/discover/group2_data_grid3/config.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { FtrConfigProviderContext } from '@kbn/test';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const functionalConfig = await readConfigFile(require.resolve('../../../config.base.js'));
+
+  return {
+    ...functionalConfig.getAll(),
+    testFiles: [require.resolve('.')],
+  };
+}
diff --git a/test/functional/apps/discover/group2_data_grid3/index.ts b/test/functional/apps/discover/group2_data_grid3/index.ts
new file mode 100644
index 0000000000000..7200eb1e9bf10
--- /dev/null
+++ b/test/functional/apps/discover/group2_data_grid3/index.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function ({ getService, loadTestFile }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const browser = getService('browser');
+
+  describe('discover/group2/data_grid3', function () {
+    before(async function () {
+      await browser.setWindowSize(1600, 1200);
+    });
+
+    after(async function unloadMakelogs() {
+      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+    });
+
+    loadTestFile(require.resolve('./_data_grid_row_navigation'));
+    loadTestFile(require.resolve('./_data_grid_row_height'));
+    loadTestFile(require.resolve('./_data_grid_sample_size'));
+    loadTestFile(require.resolve('./_data_grid_pagination'));
+  });
+}
diff --git a/test/functional/apps/discover/group3/index.ts b/test/functional/apps/discover/group3/index.ts
index 2fe5a4ebb1db1..37020693cbb11 100644
--- a/test/functional/apps/discover/group3/index.ts
+++ b/test/functional/apps/discover/group3/index.ts
@@ -21,14 +21,9 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
     });
 
     loadTestFile(require.resolve('./_default_columns'));
-    loadTestFile(require.resolve('./_time_field_column'));
     loadTestFile(require.resolve('./_drag_drop'));
-    loadTestFile(require.resolve('./_sidebar'));
-    loadTestFile(require.resolve('./_sidebar_field_stats'));
     loadTestFile(require.resolve('./_request_counts'));
     loadTestFile(require.resolve('./_doc_viewer'));
-    loadTestFile(require.resolve('./_view_mode_toggle'));
-    loadTestFile(require.resolve('./_unsaved_changes_badge'));
     loadTestFile(require.resolve('./_panels_toggle'));
   });
 }
diff --git a/test/functional/apps/discover/group4/index.ts b/test/functional/apps/discover/group4/index.ts
index e8196216c2336..ec2c97a4d208e 100644
--- a/test/functional/apps/discover/group4/index.ts
+++ b/test/functional/apps/discover/group4/index.ts
@@ -20,21 +20,13 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
       await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
     });
 
-    loadTestFile(require.resolve('./_indexpattern_without_timefield'));
     loadTestFile(require.resolve('./_discover_fields_api'));
     loadTestFile(require.resolve('./_adhoc_data_views'));
     loadTestFile(require.resolve('./_esql_view'));
-    loadTestFile(require.resolve('./_indexpattern_with_unmapped_fields'));
-    loadTestFile(require.resolve('./_runtime_fields_editor'));
-    loadTestFile(require.resolve('./_huge_fields'));
     loadTestFile(require.resolve('./_date_nested'));
-    loadTestFile(require.resolve('./_search_on_page_load'));
     loadTestFile(require.resolve('./_chart_hidden'));
     loadTestFile(require.resolve('./_context_encoded_url_params'));
-    loadTestFile(require.resolve('./_hide_announcements'));
     loadTestFile(require.resolve('./_data_view_edit'));
     loadTestFile(require.resolve('./_field_list_new_fields'));
-    loadTestFile(require.resolve('./_request_cancellation'));
-    loadTestFile(require.resolve('./_new_search'));
   });
 }
diff --git a/test/functional/apps/discover/group1/_field_data.ts b/test/functional/apps/discover/group5/_field_data.ts
similarity index 100%
rename from test/functional/apps/discover/group1/_field_data.ts
rename to test/functional/apps/discover/group5/_field_data.ts
diff --git a/test/functional/apps/discover/group1/_field_data_with_fields_api.ts b/test/functional/apps/discover/group5/_field_data_with_fields_api.ts
similarity index 100%
rename from test/functional/apps/discover/group1/_field_data_with_fields_api.ts
rename to test/functional/apps/discover/group5/_field_data_with_fields_api.ts
diff --git a/test/functional/apps/discover/group1/_filter_editor.ts b/test/functional/apps/discover/group5/_filter_editor.ts
similarity index 100%
rename from test/functional/apps/discover/group1/_filter_editor.ts
rename to test/functional/apps/discover/group5/_filter_editor.ts
diff --git a/test/functional/apps/discover/group1/_greeting_screen.ts b/test/functional/apps/discover/group5/_greeting_screen.ts
similarity index 100%
rename from test/functional/apps/discover/group1/_greeting_screen.ts
rename to test/functional/apps/discover/group5/_greeting_screen.ts
diff --git a/test/functional/apps/discover/group1/_inspector.ts b/test/functional/apps/discover/group5/_inspector.ts
similarity index 100%
rename from test/functional/apps/discover/group1/_inspector.ts
rename to test/functional/apps/discover/group5/_inspector.ts
diff --git a/test/functional/apps/discover/group1/_large_string.ts b/test/functional/apps/discover/group5/_large_string.ts
similarity index 100%
rename from test/functional/apps/discover/group1/_large_string.ts
rename to test/functional/apps/discover/group5/_large_string.ts
diff --git a/test/functional/apps/discover/group1/_no_data.ts b/test/functional/apps/discover/group5/_no_data.ts
similarity index 100%
rename from test/functional/apps/discover/group1/_no_data.ts
rename to test/functional/apps/discover/group5/_no_data.ts
diff --git a/test/functional/apps/discover/group1/_shared_links.ts b/test/functional/apps/discover/group5/_shared_links.ts
similarity index 100%
rename from test/functional/apps/discover/group1/_shared_links.ts
rename to test/functional/apps/discover/group5/_shared_links.ts
diff --git a/test/functional/apps/discover/group1/_source_filters.ts b/test/functional/apps/discover/group5/_source_filters.ts
similarity index 100%
rename from test/functional/apps/discover/group1/_source_filters.ts
rename to test/functional/apps/discover/group5/_source_filters.ts
diff --git a/test/functional/apps/discover/group1/_url_state.ts b/test/functional/apps/discover/group5/_url_state.ts
similarity index 100%
rename from test/functional/apps/discover/group1/_url_state.ts
rename to test/functional/apps/discover/group5/_url_state.ts
diff --git a/test/functional/apps/discover/group5/config.ts b/test/functional/apps/discover/group5/config.ts
new file mode 100644
index 0000000000000..a70a190ca63f8
--- /dev/null
+++ b/test/functional/apps/discover/group5/config.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { FtrConfigProviderContext } from '@kbn/test';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const functionalConfig = await readConfigFile(require.resolve('../../../config.base.js'));
+
+  return {
+    ...functionalConfig.getAll(),
+    testFiles: [require.resolve('.')],
+  };
+}
diff --git a/test/functional/apps/discover/group5/index.ts b/test/functional/apps/discover/group5/index.ts
new file mode 100644
index 0000000000000..bc875494307d6
--- /dev/null
+++ b/test/functional/apps/discover/group5/index.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function ({ getService, loadTestFile }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const browser = getService('browser');
+
+  describe('discover/group5', function () {
+    before(async function () {
+      await browser.setWindowSize(1300, 800);
+    });
+
+    after(async function unloadMakelogs() {
+      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+    });
+
+    loadTestFile(require.resolve('./_no_data'));
+    loadTestFile(require.resolve('./_filter_editor'));
+    loadTestFile(require.resolve('./_field_data'));
+    loadTestFile(require.resolve('./_field_data_with_fields_api'));
+    loadTestFile(require.resolve('./_shared_links'));
+    loadTestFile(require.resolve('./_source_filters'));
+    loadTestFile(require.resolve('./_large_string'));
+    loadTestFile(require.resolve('./_greeting_screen'));
+    loadTestFile(require.resolve('./_inspector'));
+    loadTestFile(require.resolve('./_url_state'));
+  });
+}
diff --git a/test/functional/apps/discover/group3/_sidebar.ts b/test/functional/apps/discover/group6/_sidebar.ts
similarity index 100%
rename from test/functional/apps/discover/group3/_sidebar.ts
rename to test/functional/apps/discover/group6/_sidebar.ts
diff --git a/test/functional/apps/discover/group3/_sidebar_field_stats.ts b/test/functional/apps/discover/group6/_sidebar_field_stats.ts
similarity index 100%
rename from test/functional/apps/discover/group3/_sidebar_field_stats.ts
rename to test/functional/apps/discover/group6/_sidebar_field_stats.ts
diff --git a/test/functional/apps/discover/group3/_time_field_column.ts b/test/functional/apps/discover/group6/_time_field_column.ts
similarity index 100%
rename from test/functional/apps/discover/group3/_time_field_column.ts
rename to test/functional/apps/discover/group6/_time_field_column.ts
diff --git a/test/functional/apps/discover/group3/_unsaved_changes_badge.ts b/test/functional/apps/discover/group6/_unsaved_changes_badge.ts
similarity index 100%
rename from test/functional/apps/discover/group3/_unsaved_changes_badge.ts
rename to test/functional/apps/discover/group6/_unsaved_changes_badge.ts
diff --git a/test/functional/apps/discover/group3/_view_mode_toggle.ts b/test/functional/apps/discover/group6/_view_mode_toggle.ts
similarity index 100%
rename from test/functional/apps/discover/group3/_view_mode_toggle.ts
rename to test/functional/apps/discover/group6/_view_mode_toggle.ts
diff --git a/test/functional/apps/discover/group6/config.ts b/test/functional/apps/discover/group6/config.ts
new file mode 100644
index 0000000000000..a70a190ca63f8
--- /dev/null
+++ b/test/functional/apps/discover/group6/config.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { FtrConfigProviderContext } from '@kbn/test';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const functionalConfig = await readConfigFile(require.resolve('../../../config.base.js'));
+
+  return {
+    ...functionalConfig.getAll(),
+    testFiles: [require.resolve('.')],
+  };
+}
diff --git a/test/functional/apps/discover/group6/index.ts b/test/functional/apps/discover/group6/index.ts
new file mode 100644
index 0000000000000..f71d96e63d2fd
--- /dev/null
+++ b/test/functional/apps/discover/group6/index.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function ({ getService, loadTestFile }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const browser = getService('browser');
+
+  describe('discover/group6', function () {
+    before(async function () {
+      await browser.setWindowSize(1300, 800);
+    });
+
+    after(async function unloadMakelogs() {
+      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+    });
+
+    loadTestFile(require.resolve('./_sidebar'));
+    loadTestFile(require.resolve('./_sidebar_field_stats'));
+    loadTestFile(require.resolve('./_time_field_column'));
+    loadTestFile(require.resolve('./_unsaved_changes_badge'));
+    loadTestFile(require.resolve('./_view_mode_toggle'));
+  });
+}
diff --git a/test/functional/apps/discover/group4/_huge_fields.ts b/test/functional/apps/discover/group7/_huge_fields.ts
similarity index 100%
rename from test/functional/apps/discover/group4/_huge_fields.ts
rename to test/functional/apps/discover/group7/_huge_fields.ts
diff --git a/test/functional/apps/discover/group4/_indexpattern_with_unmapped_fields.ts b/test/functional/apps/discover/group7/_indexpattern_with_unmapped_fields.ts
similarity index 100%
rename from test/functional/apps/discover/group4/_indexpattern_with_unmapped_fields.ts
rename to test/functional/apps/discover/group7/_indexpattern_with_unmapped_fields.ts
diff --git a/test/functional/apps/discover/group4/_indexpattern_without_timefield.ts b/test/functional/apps/discover/group7/_indexpattern_without_timefield.ts
similarity index 100%
rename from test/functional/apps/discover/group4/_indexpattern_without_timefield.ts
rename to test/functional/apps/discover/group7/_indexpattern_without_timefield.ts
diff --git a/test/functional/apps/discover/group4/_new_search.ts b/test/functional/apps/discover/group7/_new_search.ts
similarity index 100%
rename from test/functional/apps/discover/group4/_new_search.ts
rename to test/functional/apps/discover/group7/_new_search.ts
diff --git a/test/functional/apps/discover/group4/_request_cancellation.ts b/test/functional/apps/discover/group7/_request_cancellation.ts
similarity index 100%
rename from test/functional/apps/discover/group4/_request_cancellation.ts
rename to test/functional/apps/discover/group7/_request_cancellation.ts
diff --git a/test/functional/apps/discover/group4/_runtime_fields_editor.ts b/test/functional/apps/discover/group7/_runtime_fields_editor.ts
similarity index 100%
rename from test/functional/apps/discover/group4/_runtime_fields_editor.ts
rename to test/functional/apps/discover/group7/_runtime_fields_editor.ts
diff --git a/test/functional/apps/discover/group4/_search_on_page_load.ts b/test/functional/apps/discover/group7/_search_on_page_load.ts
similarity index 100%
rename from test/functional/apps/discover/group4/_search_on_page_load.ts
rename to test/functional/apps/discover/group7/_search_on_page_load.ts
diff --git a/test/functional/apps/discover/group7/config.ts b/test/functional/apps/discover/group7/config.ts
new file mode 100644
index 0000000000000..a70a190ca63f8
--- /dev/null
+++ b/test/functional/apps/discover/group7/config.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { FtrConfigProviderContext } from '@kbn/test';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const functionalConfig = await readConfigFile(require.resolve('../../../config.base.js'));
+
+  return {
+    ...functionalConfig.getAll(),
+    testFiles: [require.resolve('.')],
+  };
+}
diff --git a/test/functional/apps/discover/group7/index.ts b/test/functional/apps/discover/group7/index.ts
new file mode 100644
index 0000000000000..3abc84514f15d
--- /dev/null
+++ b/test/functional/apps/discover/group7/index.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function ({ getService, loadTestFile }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const browser = getService('browser');
+
+  describe('discover/group7', function () {
+    before(async function () {
+      await browser.setWindowSize(1600, 1200);
+    });
+
+    after(async function unloadMakelogs() {
+      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+    });
+
+    loadTestFile(require.resolve('./_indexpattern_without_timefield'));
+    loadTestFile(require.resolve('./_indexpattern_with_unmapped_fields'));
+    loadTestFile(require.resolve('./_runtime_fields_editor'));
+    loadTestFile(require.resolve('./_huge_fields'));
+    loadTestFile(require.resolve('./_search_on_page_load'));
+    loadTestFile(require.resolve('./_request_cancellation'));
+    loadTestFile(require.resolve('./_new_search'));
+  });
+}
diff --git a/test/functional/apps/discover/group4/_hide_announcements.ts b/test/functional/apps/discover/group8/_hide_announcements.ts
similarity index 100%
rename from test/functional/apps/discover/group4/_hide_announcements.ts
rename to test/functional/apps/discover/group8/_hide_announcements.ts
diff --git a/test/functional/apps/discover/group8/config.ts b/test/functional/apps/discover/group8/config.ts
new file mode 100644
index 0000000000000..a70a190ca63f8
--- /dev/null
+++ b/test/functional/apps/discover/group8/config.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { FtrConfigProviderContext } from '@kbn/test';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const functionalConfig = await readConfigFile(require.resolve('../../../config.base.js'));
+
+  return {
+    ...functionalConfig.getAll(),
+    testFiles: [require.resolve('.')],
+  };
+}
diff --git a/test/functional/apps/discover/group8/index.ts b/test/functional/apps/discover/group8/index.ts
new file mode 100644
index 0000000000000..09aaca23e8b95
--- /dev/null
+++ b/test/functional/apps/discover/group8/index.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function ({ getService, loadTestFile }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const browser = getService('browser');
+
+  describe('discover/group8', function () {
+    before(async function () {
+      await browser.setWindowSize(1600, 1200);
+    });
+
+    after(async function unloadMakelogs() {
+      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+    });
+
+    loadTestFile(require.resolve('./_hide_announcements'));
+  });
+}
diff --git a/test/functional/firefox/discover.config.ts b/test/functional/firefox/discover.config.ts
index 8b7e7205cd434..52d3fb3cbd35c 100644
--- a/test/functional/firefox/discover.config.ts
+++ b/test/functional/firefox/discover.config.ts
@@ -19,7 +19,9 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     testFiles: [
       require.resolve('../apps/discover/classic'),
       require.resolve('../apps/discover/group1'),
-      require.resolve('../apps/discover/group2'),
+      require.resolve('../apps/discover/group2_data_grid1'),
+      require.resolve('../apps/discover/group2_data_grid2'),
+      require.resolve('../apps/discover/group2_data_grid3'),
       require.resolve('../apps/discover/group3'),
       require.resolve('../apps/discover/group4'),
     ],

From 9c2842c9389db7831de3ca7cc811d53866113eec Mon Sep 17 00:00:00 2001
From: Julia Rechkunova <julia.rechkunova@elastic.co>
Date: Thu, 4 Apr 2024 15:53:54 +0200
Subject: [PATCH 2/3] [Discover] Fix for firefox

---
 test/functional/firefox/discover.config.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/functional/firefox/discover.config.ts b/test/functional/firefox/discover.config.ts
index 52d3fb3cbd35c..5c9f9c0939754 100644
--- a/test/functional/firefox/discover.config.ts
+++ b/test/functional/firefox/discover.config.ts
@@ -24,6 +24,10 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       require.resolve('../apps/discover/group2_data_grid3'),
       require.resolve('../apps/discover/group3'),
       require.resolve('../apps/discover/group4'),
+      require.resolve('../apps/discover/group5'),
+      require.resolve('../apps/discover/group6'),
+      require.resolve('../apps/discover/group7'),
+      require.resolve('../apps/discover/group8'),
     ],
 
     junit: {

From 41706f2e98eb1c1c78bc55ae3f03302dc4f86304 Mon Sep 17 00:00:00 2001
From: Julia Rechkunova <julia.rechkunova@elastic.co>
Date: Fri, 12 Apr 2024 17:38:05 +0200
Subject: [PATCH 3/3] [Discover] Relocate serverless tests accordingly

---
 .../common/discover/group1/index.ts           |  1 -
 .../common/discover/group2/index.ts           |  1 -
 .../common/discover/group3/index.ts           |  2 --
 .../{group2 => group4}/_adhoc_data_views.ts   |  0
 .../common/discover/group4/index.ts           | 25 ++++++++++++++++++
 .../discover/{group1 => group5}/_url_state.ts |  0
 .../common/discover/group5/index.ts           | 25 ++++++++++++++++++
 .../discover/{group3 => group6}/_sidebar.ts   |  0
 .../_unsaved_changes_badge.ts                 |  0
 .../common/discover/group6/index.ts           | 26 +++++++++++++++++++
 .../common_configs/config.group5.ts           |  3 +++
 .../search/common_configs/config.group5.ts    |  3 +++
 .../security/common_configs/config.group5.ts  |  3 +++
 13 files changed, 85 insertions(+), 4 deletions(-)
 rename x-pack/test_serverless/functional/test_suites/common/discover/{group2 => group4}/_adhoc_data_views.ts (100%)
 create mode 100644 x-pack/test_serverless/functional/test_suites/common/discover/group4/index.ts
 rename x-pack/test_serverless/functional/test_suites/common/discover/{group1 => group5}/_url_state.ts (100%)
 create mode 100644 x-pack/test_serverless/functional/test_suites/common/discover/group5/index.ts
 rename x-pack/test_serverless/functional/test_suites/common/discover/{group3 => group6}/_sidebar.ts (100%)
 rename x-pack/test_serverless/functional/test_suites/common/discover/{group3 => group6}/_unsaved_changes_badge.ts (100%)
 create mode 100644 x-pack/test_serverless/functional/test_suites/common/discover/group6/index.ts

diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/group1/index.ts b/x-pack/test_serverless/functional/test_suites/common/discover/group1/index.ts
index 4ad60320df38b..9fc6d4447e8c7 100644
--- a/x-pack/test_serverless/functional/test_suites/common/discover/group1/index.ts
+++ b/x-pack/test_serverless/functional/test_suites/common/discover/group1/index.ts
@@ -22,6 +22,5 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
 
     loadTestFile(require.resolve('./_discover'));
     loadTestFile(require.resolve('./_discover_histogram'));
-    loadTestFile(require.resolve('./_url_state'));
   });
 }
diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/group2/index.ts b/x-pack/test_serverless/functional/test_suites/common/discover/group2/index.ts
index c579eca3bb7bd..658b92845ffca 100644
--- a/x-pack/test_serverless/functional/test_suites/common/discover/group2/index.ts
+++ b/x-pack/test_serverless/functional/test_suites/common/discover/group2/index.ts
@@ -22,6 +22,5 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
 
     loadTestFile(require.resolve('./_data_grid_doc_navigation'));
     loadTestFile(require.resolve('./_data_grid_doc_table'));
-    loadTestFile(require.resolve('./_adhoc_data_views'));
   });
 }
diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/group3/index.ts b/x-pack/test_serverless/functional/test_suites/common/discover/group3/index.ts
index 9f322013d986b..70d95fef41958 100644
--- a/x-pack/test_serverless/functional/test_suites/common/discover/group3/index.ts
+++ b/x-pack/test_serverless/functional/test_suites/common/discover/group3/index.ts
@@ -20,8 +20,6 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
       await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
     });
 
-    loadTestFile(require.resolve('./_sidebar'));
     loadTestFile(require.resolve('./_request_counts'));
-    loadTestFile(require.resolve('./_unsaved_changes_badge'));
   });
 }
diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/group2/_adhoc_data_views.ts b/x-pack/test_serverless/functional/test_suites/common/discover/group4/_adhoc_data_views.ts
similarity index 100%
rename from x-pack/test_serverless/functional/test_suites/common/discover/group2/_adhoc_data_views.ts
rename to x-pack/test_serverless/functional/test_suites/common/discover/group4/_adhoc_data_views.ts
diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/group4/index.ts b/x-pack/test_serverless/functional/test_suites/common/discover/group4/index.ts
new file mode 100644
index 0000000000000..c262798065000
--- /dev/null
+++ b/x-pack/test_serverless/functional/test_suites/common/discover/group4/index.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../../../ftr_provider_context';
+
+export default function ({ getService, loadTestFile }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const browser = getService('browser');
+
+  describe('discover/group4', function () {
+    before(async function () {
+      await browser.setWindowSize(1600, 1200);
+    });
+
+    after(async function unloadMakelogs() {
+      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+    });
+
+    loadTestFile(require.resolve('./_adhoc_data_views'));
+  });
+}
diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/group1/_url_state.ts b/x-pack/test_serverless/functional/test_suites/common/discover/group5/_url_state.ts
similarity index 100%
rename from x-pack/test_serverless/functional/test_suites/common/discover/group1/_url_state.ts
rename to x-pack/test_serverless/functional/test_suites/common/discover/group5/_url_state.ts
diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/group5/index.ts b/x-pack/test_serverless/functional/test_suites/common/discover/group5/index.ts
new file mode 100644
index 0000000000000..a38a6d4e33dd6
--- /dev/null
+++ b/x-pack/test_serverless/functional/test_suites/common/discover/group5/index.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../../../ftr_provider_context';
+
+export default function ({ getService, loadTestFile }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const browser = getService('browser');
+
+  describe('discover/group5', function () {
+    before(async function () {
+      await browser.setWindowSize(1300, 800);
+    });
+
+    after(async function unloadMakelogs() {
+      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+    });
+
+    loadTestFile(require.resolve('./_url_state'));
+  });
+}
diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/group3/_sidebar.ts b/x-pack/test_serverless/functional/test_suites/common/discover/group6/_sidebar.ts
similarity index 100%
rename from x-pack/test_serverless/functional/test_suites/common/discover/group3/_sidebar.ts
rename to x-pack/test_serverless/functional/test_suites/common/discover/group6/_sidebar.ts
diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/group3/_unsaved_changes_badge.ts b/x-pack/test_serverless/functional/test_suites/common/discover/group6/_unsaved_changes_badge.ts
similarity index 100%
rename from x-pack/test_serverless/functional/test_suites/common/discover/group3/_unsaved_changes_badge.ts
rename to x-pack/test_serverless/functional/test_suites/common/discover/group6/_unsaved_changes_badge.ts
diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/group6/index.ts b/x-pack/test_serverless/functional/test_suites/common/discover/group6/index.ts
new file mode 100644
index 0000000000000..8857ebe9bf310
--- /dev/null
+++ b/x-pack/test_serverless/functional/test_suites/common/discover/group6/index.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../../../ftr_provider_context';
+
+export default function ({ getService, loadTestFile }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const browser = getService('browser');
+
+  describe('discover/group6', function () {
+    before(async function () {
+      await browser.setWindowSize(1300, 800);
+    });
+
+    after(async function unloadMakelogs() {
+      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+    });
+
+    loadTestFile(require.resolve('./_sidebar'));
+    loadTestFile(require.resolve('./_unsaved_changes_badge'));
+  });
+}
diff --git a/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group5.ts b/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group5.ts
index 7b8fb4b072847..be3c0098d35d2 100644
--- a/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group5.ts
+++ b/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group5.ts
@@ -16,6 +16,9 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       require.resolve('../../common/discover/group1'),
       require.resolve('../../common/discover/group2'),
       require.resolve('../../common/discover/group3'),
+      require.resolve('../../common/discover/group4'),
+      require.resolve('../../common/discover/group5'),
+      require.resolve('../../common/discover/group6'),
     ],
     junit: {
       reportName: 'Serverless Observability Functional Tests - Common Group 5',
diff --git a/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group5.ts b/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group5.ts
index 70cabf59051a9..ad661b474a33d 100644
--- a/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group5.ts
+++ b/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group5.ts
@@ -16,6 +16,9 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       require.resolve('../../common/discover/group1'),
       require.resolve('../../common/discover/group2'),
       require.resolve('../../common/discover/group3'),
+      require.resolve('../../common/discover/group4'),
+      require.resolve('../../common/discover/group5'),
+      require.resolve('../../common/discover/group6'),
     ],
     junit: {
       reportName: 'Serverless Search Functional Tests - Common Group 5',
diff --git a/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group5.ts b/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group5.ts
index d1637bf34b4fd..c65131e27e9e8 100644
--- a/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group5.ts
+++ b/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group5.ts
@@ -16,6 +16,9 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       require.resolve('../../common/discover/group1'),
       require.resolve('../../common/discover/group2'),
       require.resolve('../../common/discover/group3'),
+      require.resolve('../../common/discover/group4'),
+      require.resolve('../../common/discover/group5'),
+      require.resolve('../../common/discover/group6'),
     ],
     junit: {
       reportName: 'Serverless Security Functional Tests - Common Group 5',