chore(NA): rebalance x-pack cigroups (#84099)

* chore(NA): rebalance cigroup1 into cigroup5 * chore(NA): get list api integration into cigropup1 again * chore(NA): get apm integration basic into cigropup1 again * chore(NA): move back apm_api_integration trial tests into ciGroup1 * chore(NA): move exception operators data types into ciGroup1 again * chore(NA): move detection engine api security and spaces back into ciGroup1 * chore(NA): add a new xpack cigroup11 * chore(NA): correctly create 11 xpack ci groups * chore(NA): try to balance ciGroup2 and 8 * chore(NA): reset number of xpack parallel worker builds to 10 Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
elastic · Nov 24, 2020 · 9ee1ec7 · 9ee1ec7
1 parent 1159169
commit 9ee1ec7
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 6 deletions.
diff --git a/.ci/es-snapshots/Jenkinsfile_verify_es b/.ci/es-snapshots/Jenkinsfile_verify_es
@@ -55,6 +55,7 @@ kibanaPipeline(timeoutMinutes: 150) {
             'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
             'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
             'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
+            'xpack-ciGroup11': kibanaPipeline.xpackCiGroupProcess(11),
           ]),
         ])
       }

diff --git a/.ci/jobs.yml b/.ci/jobs.yml
@@ -31,6 +31,7 @@ JOB:
   - x-pack-ciGroup8
   - x-pack-ciGroup9
   - x-pack-ciGroup10
+  - x-pack-ciGroup11
   - x-pack-accessibility
   - x-pack-visualRegression
 

diff --git a/test/scripts/jenkins_xpack_build_kibana.sh b/test/scripts/jenkins_xpack_build_kibana.sh
@@ -22,7 +22,8 @@ node scripts/functional_tests --assert-none-excluded \
   --include-tag ciGroup7 \
   --include-tag ciGroup8 \
   --include-tag ciGroup9 \
-  --include-tag ciGroup10
+  --include-tag ciGroup10 \
+  --include-tag ciGroup11
 
 # Do not build kibana for code coverage run
 if [[ -z "$CODE_COVERAGE" ]] ; then

diff --git a/vars/kibanaCoverage.groovy b/vars/kibanaCoverage.groovy
@@ -249,6 +249,7 @@ def xpackProks() {
     'xpack-ciGroup8' : kibanaPipeline.xpackCiGroupProcess(8),
     'xpack-ciGroup9' : kibanaPipeline.xpackCiGroupProcess(9),
     'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
+    'xpack-ciGroup11': kibanaPipeline.xpackCiGroupProcess(11),
   ]
 }
 

diff --git a/vars/tasks.groovy b/vars/tasks.groovy
@@ -94,7 +94,7 @@ def functionalXpack(Map params = [:]) {
     kibanaPipeline.buildXpack(10)
 
     if (config.ciGroups) {
-      def ciGroups = 1..10
+      def ciGroups = 1..11
       tasks(ciGroups.collect { kibanaPipeline.xpackCiGroupProcess(it) })
     }
 

diff --git a/x-pack/test/case_api_integration/basic/tests/index.ts b/x-pack/test/case_api_integration/basic/tests/index.ts
@@ -10,7 +10,7 @@ import { FtrProviderContext } from '../../common/ftr_provider_context';
 export default ({ loadTestFile }: FtrProviderContext): void => {
   describe('case api basic', function () {
     // Fastest ciGroup for the moment.
-    this.tags('ciGroup2');
+    this.tags('ciGroup5');
 
     loadTestFile(require.resolve('./cases/comments/delete_comment'));
     loadTestFile(require.resolve('./cases/comments/find_comments'));

diff --git a/..._engine_api_integration/security_and_spaces/tests/exception_operators_data_types/index.ts b/..._engine_api_integration/security_and_spaces/tests/exception_operators_data_types/index.ts
@@ -9,7 +9,7 @@ import { FtrProviderContext } from '../../../common/ftr_provider_context';
 // eslint-disable-next-line import/no-default-export
 export default ({ loadTestFile }: FtrProviderContext): void => {
   describe('Detection exceptions data types and operators', function () {
-    this.tags('ciGroup1');
+    this.tags('ciGroup11');
 
     loadTestFile(require.resolve('./date'));
     loadTestFile(require.resolve('./double'));

diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/index.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/index.ts
@@ -9,7 +9,7 @@ import { FtrProviderContext } from '../../common/ftr_provider_context';
 // eslint-disable-next-line import/no-default-export
 export default ({ loadTestFile }: FtrProviderContext): void => {
   describe('detection engine api security and spaces enabled', function () {
-    this.tags('ciGroup1');
+    this.tags('ciGroup11');
 
     loadTestFile(require.resolve('./add_actions'));
     loadTestFile(require.resolve('./add_prepackaged_rules'));

diff --git a/x-pack/test/functional/apps/discover/index.ts b/x-pack/test/functional/apps/discover/index.ts
@@ -7,7 +7,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('discover', function () {
-    this.tags('ciGroup8');
+    this.tags('ciGroup1');
 
     loadTestFile(require.resolve('./feature_controls'));
     loadTestFile(require.resolve('./preserve_url'));