[7.x] Split ciGroup3 and ciGroup5 (#36928) (#37122)

* Split ciGroup3 and ciGroup5 (#36928)

* split large x-pack ciGroup5 into 3 groups

* split large x-pack ciGroup3 into 2 groups

* Add groups to the jenkins xpack ci group file

* Re-level some more work

* move es_search_source test to new describe block

* move es_search_source to first in ciGroup7

* move to x-pack-ciGroup6

.ci/jobs.yml

@@ -21,6 +21,9 @@ JOB:
   - x-pack-ciGroup5
   - x-pack-ciGroup6
   - x-pack-ciGroup7
+  - x-pack-ciGroup8
+  - x-pack-ciGroup9
+  - x-pack-ciGroup10
 
 # `~` is yaml for `null`
 exclude: ~

test/scripts/jenkins_xpack_ci_group.sh

@@ -24,7 +24,10 @@ node scripts/functional_tests --assert-none-excluded \
   --include-tag ciGroup4 \
   --include-tag ciGroup5 \
   --include-tag ciGroup6 \
-  --include-tag ciGroup7
+  --include-tag ciGroup7 \
+  --include-tag ciGroup8 \
+  --include-tag ciGroup9 \
+  --include-tag ciGroup10
 
 echo " -> building and extracting default Kibana distributable for use in functional tests"
 cd "$KIBANA_DIR"

x-pack/test/api_integration/apis/index.js

@@ -6,7 +6,7 @@
 
 export default function ({ loadTestFile }) {
   describe('apis', function () {
-    this.tags('ciGroup5');
+    this.tags('ciGroup6');
 
     loadTestFile(require.resolve('./es'));
     loadTestFile(require.resolve('./security'));

x-pack/test/functional/apps/maps/index.js

@@ -29,6 +29,7 @@ export default function ({ loadTestFile, getService }) {
 
     describe('', function () {
       this.tags('ciGroup7');
+      loadTestFile(require.resolve('./es_search_source'));
       loadTestFile(require.resolve('./saved_object_management'));
       loadTestFile(require.resolve('./sample_data'));
       loadTestFile(require.resolve('./feature_controls/maps_security'));
@@ -36,8 +37,7 @@ export default function ({ loadTestFile, getService }) {
     });
 
     describe('', function () {
-      this.tags('ciGroup3');
-      loadTestFile(require.resolve('./es_search_source'));
+      this.tags('ciGroup10');
       loadTestFile(require.resolve('./es_geo_grid_source'));
       loadTestFile(require.resolve('./joins'));
       loadTestFile(require.resolve('./add_layer_panel'));

x-pack/test/saved_object_api_integration/security_only/apis/index.ts

@@ -13,7 +13,7 @@ export default function({ getService, loadTestFile }: TestInvoker) {
   const supertest = getService('supertest');
 
   describe('saved objects security only enabled', function() {
-    this.tags('ciGroup5');
+    this.tags('ciGroup9');
 
     before(async () => {
       await createUsersAndRoles(es, supertest);

x-pack/test/spaces_api_integration/security_and_spaces/apis/index.ts

@@ -13,7 +13,7 @@ export default function({ loadTestFile, getService }: TestInvoker) {
   const supertest = getService('supertest');
 
   describe('spaces api with security', function() {
-    this.tags('ciGroup5');
+    this.tags('ciGroup8');
 
     before(async () => {
       await createUsersAndRoles(es, supertest);

x-pack/test/spaces_api_integration/spaces_only/apis/index.ts

@@ -9,7 +9,7 @@ import { TestInvoker } from '../../common/lib/types';
 // eslint-disable-next-line import/no-default-export
 export default function spacesOnlyTestSuite({ loadTestFile }: TestInvoker) {
   describe('spaces api without security', function() {
-    this.tags('ciGroup5');
+    this.tags('ciGroup6');
 
     loadTestFile(require.resolve('./create'));
     loadTestFile(require.resolve('./delete'));

x-pack/test/ui_capabilities/security_and_spaces/tests/index.ts

@@ -21,7 +21,7 @@ export default function uiCapabilitiesTests({
   const featuresService: FeaturesService = getService('features');
 
   describe('ui capabilities', function() {
-    this.tags('ciGroup5');
+    this.tags('ciGroup9');
 
     before(async () => {
       const features = await featuresService.get();

x-pack/test/ui_capabilities/security_only/tests/index.ts

@@ -17,7 +17,7 @@ export default function uiCapabilitesTests({
   const securityService: SecurityService = getService('security');
 
   describe('ui capabilities', function() {
-    this.tags('ciGroup5');
+    this.tags('ciGroup9');
 
     before(async () => {
       for (const user of UserScenarios) {

x-pack/test/ui_capabilities/spaces_only/tests/index.ts

@@ -18,7 +18,7 @@ export default function uiCapabilitesTests({
   const featuresService: FeaturesService = getService('features');
 
   describe('ui capabilities', function() {
-    this.tags('ciGroup5');
+    this.tags('ciGroup9');
 
     before(async () => {
       const features = await featuresService.get();

x-pack/test/upgrade_assistant_integration/upgrade_assistant/index.js

@@ -6,7 +6,7 @@
 
 export default function ({ loadTestFile }) {
   describe('upgrade assistant', function () {
-    this.tags('ciGroup5');
+    this.tags('ciGroup6');
 
     loadTestFile(require.resolve('./query_default_field'));
     loadTestFile(require.resolve('./reindexing'));