From 82d210af231e5109e823f262553d6d4e25c50dfa Mon Sep 17 00:00:00 2001
From: Brian Seeders <brian.seeders@elastic.co>
Date: Thu, 30 Sep 2021 18:11:55 -0400
Subject: [PATCH] [7.15] [CI] Balance ci groups (#110711) (#113162)

* [CI] Balance ci groups (#110711)

# Conflicts:
#	test/functional/apps/visualize/index.ts

* Update index.ts

* Update synthetics_integration.ts

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 test/functional/apps/visualize/index.ts                    | 7 ++++++-
 .../security_and_spaces/tests/basic/index.ts               | 2 +-
 .../security_and_spaces/tests/trial/index.ts               | 2 +-
 x-pack/test/functional/apps/apm/index.ts                   | 2 +-
 x-pack/test/functional/apps/lens/index.ts                  | 6 +++++-
 x-pack/test/functional/config.js                           | 2 +-
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/test/functional/apps/visualize/index.ts b/test/functional/apps/visualize/index.ts
index 70cd0df5d4eed..3f65294b035bb 100644
--- a/test/functional/apps/visualize/index.ts
+++ b/test/functional/apps/visualize/index.ts
@@ -95,13 +95,18 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
       loadTestFile(require.resolve('./_region_map'));
     });
 
+    describe('visualize ciGroup8', function () {
+      this.tags('ciGroup8');
+
+      loadTestFile(require.resolve('./_tsvb_chart'));
+    });
+
     describe('visualize ciGroup11', function () {
       this.tags('ciGroup11');
 
       loadTestFile(require.resolve('./_tag_cloud'));
       loadTestFile(require.resolve('./_vertical_bar_chart'));
       loadTestFile(require.resolve('./_vertical_bar_chart_nontimeindex'));
-      loadTestFile(require.resolve('./_tsvb_chart'));
       loadTestFile(require.resolve('./_tsvb_time_series'));
       loadTestFile(require.resolve('./_tsvb_markdown'));
       loadTestFile(require.resolve('./_tsvb_table'));
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/basic/index.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/basic/index.ts
index 90fbb10637434..3fb7d7a29af39 100644
--- a/x-pack/test/case_api_integration/security_and_spaces/tests/basic/index.ts
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/basic/index.ts
@@ -12,7 +12,7 @@ import { createSpacesAndUsers, deleteSpacesAndUsers } from '../../../common/lib/
 export default ({ loadTestFile, getService }: FtrProviderContext): void => {
   describe('cases security and spaces enabled: basic', function () {
     // Fastest ciGroup for the moment.
-    this.tags('ciGroup5');
+    this.tags('ciGroup13');
 
     before(async () => {
       await createSpacesAndUsers(getService);
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/trial/index.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/trial/index.ts
index 26bc6a072450d..cd4b062c065a0 100644
--- a/x-pack/test/case_api_integration/security_and_spaces/tests/trial/index.ts
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/trial/index.ts
@@ -12,7 +12,7 @@ import { createSpacesAndUsers, deleteSpacesAndUsers } from '../../../common/lib/
 export default ({ loadTestFile, getService }: FtrProviderContext): void => {
   describe('cases security and spaces enabled: trial', function () {
     // Fastest ciGroup for the moment.
-    this.tags('ciGroup5');
+    this.tags('ciGroup13');
 
     before(async () => {
       await createSpacesAndUsers(getService);
diff --git a/x-pack/test/functional/apps/apm/index.ts b/x-pack/test/functional/apps/apm/index.ts
index e4db5a66aa55f..20c2bc264a74f 100644
--- a/x-pack/test/functional/apps/apm/index.ts
+++ b/x-pack/test/functional/apps/apm/index.ts
@@ -9,7 +9,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('APM specs', function () {
-    this.tags('ciGroup6');
+    this.tags('ciGroup10');
     loadTestFile(require.resolve('./feature_controls'));
     loadTestFile(require.resolve('./correlations'));
   });
diff --git a/x-pack/test/functional/apps/lens/index.ts b/x-pack/test/functional/apps/lens/index.ts
index 19ecc017c5073..37f03bfb1a8f2 100644
--- a/x-pack/test/functional/apps/lens/index.ts
+++ b/x-pack/test/functional/apps/lens/index.ts
@@ -25,10 +25,14 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
       await esArchiver.unload('x-pack/test/functional/es_archives/lens/basic');
     });
 
+    describe('', function () {
+      this.tags(['ciGroup3', 'skipFirefox']);
+      loadTestFile(require.resolve('./smokescreen'));
+    });
+
     describe('', function () {
       this.tags(['ciGroup4', 'skipFirefox']);
 
-      loadTestFile(require.resolve('./smokescreen'));
       loadTestFile(require.resolve('./add_to_dashboard'));
       loadTestFile(require.resolve('./table'));
       loadTestFile(require.resolve('./runtime_fields'));
diff --git a/x-pack/test/functional/config.js b/x-pack/test/functional/config.js
index 2a207edbc1e46..ca120dc55a7fb 100644
--- a/x-pack/test/functional/config.js
+++ b/x-pack/test/functional/config.js
@@ -33,7 +33,6 @@ export default async function ({ readConfigFile }) {
       resolve(__dirname, './apps/discover'),
       resolve(__dirname, './apps/security'),
       resolve(__dirname, './apps/spaces'),
-      resolve(__dirname, './apps/lens'),
       resolve(__dirname, './apps/logstash'),
       resolve(__dirname, './apps/grok_debugger'),
       resolve(__dirname, './apps/infra'),
@@ -59,6 +58,7 @@ export default async function ({ readConfigFile }) {
       resolve(__dirname, './apps/reporting_management'),
       resolve(__dirname, './apps/management'),
       resolve(__dirname, './apps/reporting'),
+      resolve(__dirname, './apps/lens'), // smokescreen tests cause flakiness in other tests
 
       //This upgrade assistant file needs to be run after the rest of the jobs because of
       //it being destructive.