[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>
elastic · Sep 30, 2021 · 82d210a · 82d210a
1 parent 45d8dc4
commit 82d210a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.