[CI] Split alerting-api-integration tests into separate cigroups (#13…

…0414)
elastic · Apr 18, 2022 · 6a4eb48 · 6a4eb48
1 parent 8364fc7
commit 6a4eb48
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 30 deletions.
diff --git a/.buildkite/pipelines/es_snapshots/verify.yml b/.buildkite/pipelines/es_snapshots/verify.yml
@@ -29,7 +29,7 @@ steps:
 
   - command: .buildkite/scripts/steps/functional/xpack_cigroup.sh
     label: 'Default CI Group'
-    parallelism: 29
+    parallelism: 30
     agents:
       queue: n2-4
     depends_on: build

diff --git a/.buildkite/pipelines/flaky_tests/groups.json b/.buildkite/pipelines/flaky_tests/groups.json
@@ -32,7 +32,7 @@
     {
       "key": "xpack/cigroup",
       "name": "Default CI Group",
-      "ciGroups": 29
+      "ciGroups": 30
     },
     {
       "key": "xpack/firefox",

diff --git a/.buildkite/pipelines/on_merge.yml b/.buildkite/pipelines/on_merge.yml
@@ -51,7 +51,7 @@ steps:
 
   - command: .buildkite/scripts/steps/functional/xpack_cigroup.sh
     label: 'Default CI Group'
-    parallelism: 29
+    parallelism: 30
     agents:
       queue: n2-4-spot
     depends_on: build

diff --git a/.buildkite/pipelines/pull_request/base.yml b/.buildkite/pipelines/pull_request/base.yml
@@ -17,7 +17,7 @@ steps:
 
   - command: .buildkite/scripts/steps/functional/xpack_cigroup.sh
     label: 'Default CI Group'
-    parallelism: 29
+    parallelism: 30
     agents:
       queue: n2-4-spot-2
     depends_on: build

diff --git a/.ci/ci_groups.yml b/.ci/ci_groups.yml
@@ -41,3 +41,4 @@ xpack:
   - ciGroup27
   - ciGroup28
   - ciGroup29
+  - ciGroup30
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/index.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/index.ts
@@ -32,28 +32,35 @@ export default function alertingTests({ loadTestFile, getService }: FtrProviderC
         await tearDown(getService);
       });
 
-      loadTestFile(require.resolve('./find'));
-      loadTestFile(require.resolve('./create'));
-      loadTestFile(require.resolve('./delete'));
-      loadTestFile(require.resolve('./disable'));
-      loadTestFile(require.resolve('./enable'));
-      loadTestFile(require.resolve('./execution_status'));
-      loadTestFile(require.resolve('./get'));
-      loadTestFile(require.resolve('./get_alert_state'));
-      loadTestFile(require.resolve('./get_alert_summary'));
-      loadTestFile(require.resolve('./rule_types'));
-      loadTestFile(require.resolve('./mute_all'));
-      loadTestFile(require.resolve('./mute_instance'));
-      loadTestFile(require.resolve('./unmute_all'));
-      loadTestFile(require.resolve('./unmute_instance'));
-      loadTestFile(require.resolve('./update'));
-      loadTestFile(require.resolve('./update_api_key'));
-      loadTestFile(require.resolve('./alerts'));
-      loadTestFile(require.resolve('./event_log'));
-      loadTestFile(require.resolve('./mustache_templates'));
-      loadTestFile(require.resolve('./health'));
-      loadTestFile(require.resolve('./excluded'));
-      loadTestFile(require.resolve('./snooze'));
+      describe('', function () {
+        this.tags('ciGroup17');
+        loadTestFile(require.resolve('./find'));
+        loadTestFile(require.resolve('./create'));
+        loadTestFile(require.resolve('./delete'));
+        loadTestFile(require.resolve('./disable'));
+        loadTestFile(require.resolve('./enable'));
+        loadTestFile(require.resolve('./execution_status'));
+        loadTestFile(require.resolve('./get'));
+        loadTestFile(require.resolve('./get_alert_state'));
+        loadTestFile(require.resolve('./get_alert_summary'));
+        loadTestFile(require.resolve('./rule_types'));
+      });
+
+      describe('', function () {
+        this.tags('ciGroup30');
+        loadTestFile(require.resolve('./mute_all'));
+        loadTestFile(require.resolve('./mute_instance'));
+        loadTestFile(require.resolve('./unmute_all'));
+        loadTestFile(require.resolve('./unmute_instance'));
+        loadTestFile(require.resolve('./update'));
+        loadTestFile(require.resolve('./update_api_key'));
+        loadTestFile(require.resolve('./alerts'));
+        loadTestFile(require.resolve('./event_log'));
+        loadTestFile(require.resolve('./mustache_templates'));
+        loadTestFile(require.resolve('./health'));
+        loadTestFile(require.resolve('./excluded'));
+        loadTestFile(require.resolve('./snooze'));
+      });
     });
   });
 }
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts
@@ -58,10 +58,14 @@ export async function tearDown(getService: FtrProviderContext['getService']) {
 // eslint-disable-next-line import/no-default-export
 export default function alertingApiIntegrationTests({ loadTestFile }: FtrProviderContext) {
   describe('alerting api integration security and spaces enabled', function () {
-    this.tags('ciGroup17');
+    describe('', function () {
+      this.tags('ciGroup17');
+      loadTestFile(require.resolve('./telemetry'));
+      loadTestFile(require.resolve('./actions'));
+    });
 
-    loadTestFile(require.resolve('./telemetry'));
-    loadTestFile(require.resolve('./actions'));
-    loadTestFile(require.resolve('./alerting'));
+    describe('', function () {
+      loadTestFile(require.resolve('./alerting'));
+    });
   });
 }