Applying Yara's comment: we need to add serverlessQA to the suites th…

…at don’t currently have skipInQA. The suites that have skipInQA just need that removed now since they won’t run in there by default.
elastic · Apr 17, 2024 · 0cc8b13 · 0cc8b13
1 parent 39270f7
commit 0cc8b13
Show file tree

Hide file tree

Showing 41 changed files with 42 additions and 45 deletions.
diff --git a/...s/detections_response/detection_engine/actions/trial_license_complete_tier/add_actions.ts b/...s/detections_response/detection_engine/actions/trial_license_complete_tier/add_actions.ts
@@ -21,7 +21,7 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
   const es = getService('es');
 
-  describe('@serverless @ess add_actions', () => {
+  describe('@serverless @serverlessQA @ess add_actions', () => {
     describe('adding actions', () => {
       beforeEach(async () => {
         await es.indices.delete({ index: 'logs-test', ignore_unavailable: true });

diff --git a/...etections_response/detection_engine/actions/trial_license_complete_tier/update_actions.ts b/...etections_response/detection_engine/actions/trial_license_complete_tier/update_actions.ts
@@ -147,6 +147,7 @@ export default ({ getService }: FtrProviderContext) => {
         expect(body?.execution_summary?.last_execution?.status).toBe('succeeded');
       });
 
+      // Broken in MKI environment, needs triage
       it('@skipInServerless expects an updated rule with a webhook action and meta field runs successfully', async () => {
         const webhookAction = await createWebHookRuleAction(supertest);
 
@@ -187,6 +188,7 @@ export default ({ getService }: FtrProviderContext) => {
         expect(body?.execution_summary?.last_execution?.status).toBe('succeeded');
       });
 
+      // Broken in MKI environment, needs triage
       it('@skipInServerless adds a webhook to an immutable rule', async () => {
         const immutableRule = await getImmutableRule();
         const webhookAction = await createWebHookRuleAction(supertest);

diff --git a/...etections_response/detection_engine/alerts/basic_license_essentials_tier/field_aliases.ts b/...etections_response/detection_engine/alerts/basic_license_essentials_tier/field_aliases.ts
@@ -29,7 +29,7 @@ export default ({ getService }: FtrProviderContext) => {
     name: string;
   }
 
-  describe('@ess @serverless Tests involving aliases of source indexes and the alerts index', () => {
+  describe('@ess @serverless @serverlessQA Tests involving aliases of source indexes and the alerts index', () => {
     before(async () => {
       await esArchiver.load('x-pack/test/functional/es_archives/security_solution/alias');
     });

diff --git a/...detections_response/detection_engine/alerts/basic_license_essentials_tier/query_alerts.ts b/...detections_response/detection_engine/alerts/basic_license_essentials_tier/query_alerts.ts
@@ -34,7 +34,7 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
   const es = getService('es');
 
-  describe('@ess @serverless query_signals_route and find_alerts_route', () => {
+  describe('@ess @serverless @serverlessQA query_signals_route and find_alerts_route', () => {
     describe('validation checks', () => {
       it('should not give errors when querying and the alerts index does exist and is empty', async () => {
         await createAlertsIndex(supertest, log);

diff --git a/...s_response/detection_engine/alerts/trial_license_complete_tier/assignments/assignments.ts b/...s_response/detection_engine/alerts/trial_license_complete_tier/assignments/assignments.ts
@@ -39,8 +39,7 @@ export default ({ getService }: FtrProviderContext) => {
   const dataPathBuilder = new EsArchivePathBuilder(isServerless);
   const path = dataPathBuilder.getPath('auditbeat/hosts');
 
-  // Intentionally setting as @skipInServerless, keeping tests running in MKI that should block release
-  describe('@ess @serverless @skipInServerless Alert User Assignment - ESS & Serverless', () => {
+  describe('@ess @serverless Alert User Assignment - ESS & Serverless', () => {
     describe('validation checks', () => {
       it('should give errors when no alert ids are provided', async () => {
         const { body } = await supertest

diff --git a/...detection_engine/alerts/trial_license_complete_tier/assignments/assignments_serverless.ts b/...detection_engine/alerts/trial_license_complete_tier/assignments/assignments_serverless.ts
@@ -33,8 +33,7 @@ export default ({ getService }: FtrProviderContext) => {
   const dataPathBuilder = new EsArchivePathBuilder(isServerless);
   const path = dataPathBuilder.getPath('auditbeat/hosts');
 
-  // Intentionally setting as @skipInServerless, keeping tests running in MKI that should block release
-  describe('@serverless @skipInServerless Alert User Assignment - Serverless', () => {
+  describe('@serverless Alert User Assignment - Serverless', () => {
     before(async () => {
       await esArchiver.load(path);
     });

diff --git a/.../exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/date.ts b/.../exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/date.ts
@@ -32,7 +32,7 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
   const es = getService('es');
 
-  describe('@serverless @ess Rule exception operators for data type date', () => {
+  describe('@serverless @serverlessQA @ess Rule exception operators for data type date', () => {
     before(async () => {
       await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/date');
     });

diff --git a/...xceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/double.ts b/...xceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/double.ts
@@ -32,7 +32,7 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
   const es = getService('es');
 
-  describe('@serverless @ess Rule exception operators for data type double', () => {
+  describe('@serverless @serverlessQA @ess Rule exception operators for data type double', () => {
     before(async () => {
       await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/double');
       await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/double_as_string');

diff --git a/...exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/float.ts b/...exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/float.ts
@@ -32,7 +32,7 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
   const es = getService('es');
 
-  describe('@serverless @ess Rule exception operators for data type float', () => {
+  describe('@serverless @serverlessQA @ess Rule exception operators for data type float', () => {
     before(async () => {
       await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/float');
       await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/float_as_string');

diff --git a/...ceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/integer.ts b/...ceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/integer.ts
@@ -32,7 +32,7 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
   const es = getService('es');
 
-  describe('@serverless @ess Rule exception operators for data type integer', () => {
+  describe('@serverless @serverlessQA @ess Rule exception operators for data type integer', () => {
     before(async () => {
       await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/integer');
       await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/integer_as_string');

diff --git a/.../detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/ip.ts b/.../detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/ip.ts
@@ -32,7 +32,7 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
   const es = getService('es');
 
-  describe('@serverless @ess Rule exception operators for data type ip', () => {
+  describe('@serverless @serverless @ess Rule exception operators for data type ip', () => {
     before(async () => {
       await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/ip');
     });

diff --git a/...tion_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/ip_array.ts b/...tion_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/ip_array.ts
@@ -32,7 +32,7 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
   const es = getService('es');
 
-  describe('@serverless @ess Rule exception operators for data type ip', () => {
+  describe('@serverless @serverlessQA @ess Rule exception operators for data type ip', () => {
     before(async () => {
       await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/ip_as_array');
     });

diff --git a/...n_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/keyword.ts b/...n_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/keyword.ts
@@ -32,7 +32,7 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
   const es = getService('es');
 
-  describe('@serverless @ess Rule exception operators for data type keyword', () => {
+  describe('@serverless @serverlessQA  @ess Rule exception operators for data type keyword', () => {
     before(async () => {
       await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/keyword');
     });

diff --git a/...ne/exceptions/operators_data_types/keyword/basic_license_essentials_tier/keyword_array.ts b/...ne/exceptions/operators_data_types/keyword/basic_license_essentials_tier/keyword_array.ts
@@ -33,7 +33,7 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
   const es = getService('es');
 
-  describe('@serverless @ess Rule exception operators for data type keyword', () => {
+  describe('@serverles @serverlessQA @ess Rule exception operators for data type keyword', () => {
     before(async () => {
       await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/keyword_as_array');
     });

diff --git a/...tection_engine/exceptions/operators_data_types/long/basic_license_essentials_tier/long.ts b/...tection_engine/exceptions/operators_data_types/long/basic_license_essentials_tier/long.ts
@@ -32,7 +32,7 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
   const es = getService('es');
 
-  describe('@serverless @ess Rule exception operators for data type long', () => {
+  describe('@serverless @serverlessQA  @ess Rule exception operators for data type long', () => {
     before(async () => {
       await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/long');
       await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/long_as_string');

diff --git a/...tection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/text.ts b/...tection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/text.ts
@@ -33,7 +33,7 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
   const es = getService('es');
 
-  describe('@serverless @ess Rule exception operators for data type text', () => {
+  describe('@serverless @serverlessQA @ess Rule exception operators for data type text', () => {
     before(async () => {
       await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/text');
       await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/text_no_spaces');

diff --git a/...n_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/text_array.ts b/...n_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/text_array.ts
@@ -32,7 +32,7 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
   const es = getService('es');
 
-  describe('@serverless @ess Rule exception operators for data type text', () => {
+  describe('@serverless @serverlessQA @ess Rule exception operators for data type text', () => {
     before(async () => {
       await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/text_as_array');
     });

diff --git a/...n_engine/exceptions/workflows/basic_license_essentials_tier/create_endpoint_exceptions.ts b/...n_engine/exceptions/workflows/basic_license_essentials_tier/create_endpoint_exceptions.ts
@@ -74,7 +74,7 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
   const es = getService('es');
 
-  describe('@serverless @ess create_endpoint_exceptions', () => {
+  describe('@serverless @serverlessQA @ess create_endpoint_exceptions', () => {
     before(async () => {
       await esArchiver.load(
         'x-pack/test/functional/es_archives/rule_exceptions/endpoint_without_host_type'

diff --git a/...ction_engine/exceptions/workflows/basic_license_essentials_tier/create_rule_exceptions.ts b/...ction_engine/exceptions/workflows/basic_license_essentials_tier/create_rule_exceptions.ts
@@ -48,7 +48,7 @@ export default ({ getService }: FtrProviderContext) => {
   const config = getService('config');
   const ELASTICSEARCH_USERNAME = config.get('servers.kibana.username');
 
-  describe('@serverless @ess create "rule_default" exceptions', () => {
+  describe('@serverless @serverlessQA @ess create "rule_default" exceptions', () => {
     before(async () => {
       await createAlertsIndex(supertest, log);
     });

diff --git a/...ngine/exceptions/workflows/basic_license_essentials_tier/exception_comments_serverless.ts b/...ngine/exceptions/workflows/basic_license_essentials_tier/exception_comments_serverless.ts
@@ -26,8 +26,7 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
 
-  // @skipInServerless purposefully - only running tests in MKI whose failure should block release
-  describe('@serverless @skipInServerless exception item comments - serverless specific behavior', () => {
+  describe('@serverless exception item comments - serverless specific behavior', () => {
     describe('Rule Exceptions', () => {
       afterEach(async () => {
         await deleteAllExceptions(supertest, log);

diff --git a/...on_engine/exceptions/workflows/basic_license_essentials_tier/exceptions_data_integrity.ts b/...on_engine/exceptions/workflows/basic_license_essentials_tier/exceptions_data_integrity.ts
@@ -37,8 +37,7 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
   const es = getService('es');
 
-  // @skipInServerless purposefully - only running tests in MKI whose failure should block release
-  describe('@serverless @ess @skipInServerless exceptions data integrity', () => {
+  describe('@serverless @ess exceptions data integrity', () => {
     afterEach(async () => {
       await deleteAllAlerts(supertest, log, es);
       await deleteAllRules(supertest, log);

diff --git a/...gine/exceptions/workflows/basic_license_essentials_tier/find_rule_exception_references.ts b/...gine/exceptions/workflows/basic_license_essentials_tier/find_rule_exception_references.ts
@@ -36,7 +36,7 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
   const es = getService('es');
 
-  describe('@serverless @ess find_rule_exception_references', () => {
+  describe('@serverless @serverlessQA @ess find_rule_exception_references', () => {
     before(async () => {
       await createAlertsIndex(supertest, log);
     });

diff --git a/...nse/detection_engine/exceptions/workflows/basic_license_essentials_tier/prebuilt_rules.ts b/...nse/detection_engine/exceptions/workflows/basic_license_essentials_tier/prebuilt_rules.ts
@@ -37,8 +37,7 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
   const es = getService('es');
 
-  // @skipInServerless purposefully - only running tests in MKI whose failure should block release
-  describe('@serverless @ess @skipInServerless exceptions workflows for prebuilt rules', () => {
+  describe('@serverless @ess exceptions workflows for prebuilt rules', () => {
     describe('creating rules with exceptions', () => {
       beforeEach(async () => {
         await createAlertsIndex(supertest, log);

diff --git a/...on_engine/exceptions/workflows/basic_license_essentials_tier/rule_exceptions_execution.ts b/...on_engine/exceptions/workflows/basic_license_essentials_tier/rule_exceptions_execution.ts
@@ -58,7 +58,7 @@ export default ({ getService }: FtrProviderContext) => {
   const dataPathBuilder = new EsArchivePathBuilder(isServerless);
   const path = dataPathBuilder.getPath('auditbeat/hosts');
 
-  describe('@serverless @ess rule exceptions execution', () => {
+  describe('@serverless @serverlessQA @ess rule exceptions execution', () => {
     before(async () => {
       await esArchiver.load(path);
     });

diff --git a/.../detection_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/eql.ts b/.../detection_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/eql.ts
@@ -74,7 +74,7 @@ export default ({ getService }: FtrProviderContext) => {
   const dataPathBuilder = new EsArchivePathBuilder(isServerless);
   const auditPath = dataPathBuilder.getPath('auditbeat/hosts');
 
-  describe('@ess @serverless EQL type rules', () => {
+  describe('@ess @serverles @serverlessQA EQL type rules', () => {
     const { indexListOfDocuments } = dataGeneratorFactory({
       es,
       index: 'ecs_compliant',

diff --git a/...gine/rule_execution_logic/trial_license_complete_tier/execution_logic/machine_learning.ts b/...gine/rule_execution_logic/trial_license_complete_tier/execution_logic/machine_learning.ts
@@ -85,7 +85,7 @@ export default ({ getService }: FtrProviderContext) => {
   };
 
   // FLAKY: https://github.com/elastic/kibana/issues/171426
-  describe.skip('@ess @serverless Machine learning type rules', () => {
+  describe.skip('@ess @serverless @serverlessQA Machine learning type rules', () => {
     before(async () => {
       // Order is critical here: auditbeat data must be loaded before attempting to start the ML job,
       // as the job looks for certain indices on start

diff --git a/...tion_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/new_terms.ts b/...tion_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/new_terms.ts
@@ -81,7 +81,7 @@ export default ({ getService }: FtrProviderContext) => {
   };
 
   // Failing: See https://github.com/elastic/kibana/issues/180236
-  describe.skip('@ess @serverless New terms type rules', () => {
+  describe.skip('@ess @serverless @serverlessQA New terms type rules', () => {
     before(async () => {
       await esArchiver.load(path);
       await esArchiver.load('x-pack/test/functional/es_archives/security_solution/new_terms');

diff --git a/...xecution_logic/trial_license_complete_tier/execution_logic/new_terms_alert_suppression.ts b/...xecution_logic/trial_license_complete_tier/execution_logic/new_terms_alert_suppression.ts
@@ -55,7 +55,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   const historicalWindowStart = '2019-10-13T05:00:04.000Z';
 
-  describe('@ess @serverless New terms type rules, alert suppression', () => {
+  describe('@ess @serverless @serverlessQA New terms type rules, alert suppression', () => {
     before(async () => {
       await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
     });

diff --git a/...engine/rule_execution_logic/trial_license_complete_tier/execution_logic/non_ecs_fields.ts b/...engine/rule_execution_logic/trial_license_complete_tier/execution_logic/non_ecs_fields.ts
@@ -58,7 +58,7 @@ export default ({ getService }: FtrProviderContext) => {
     };
   };
 
-  describe('@ess @serverless Non ECS fields in alert document source', () => {
+  describe('@ess @serverless @serverlessQA Non ECS fields in alert document source', () => {
     before(async () => {
       await esArchiver.load(
         'x-pack/test/functional/es_archives/security_solution/ecs_non_compliant'

diff --git a/...etection_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/query.ts b/...etection_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/query.ts
@@ -98,7 +98,7 @@ export default ({ getService }: FtrProviderContext) => {
   const dataPathBuilder = new EsArchivePathBuilder(isServerless);
   const auditbeatPath = dataPathBuilder.getPath('auditbeat/hosts');
 
-  describe('@ess @serverless Query type rules', () => {
+  describe('@ess @serverless @serverlessQA Query type rules', () => {
     before(async () => {
       await esArchiver.load(auditbeatPath);
       await esArchiver.load('x-pack/test/functional/es_archives/security_solution/alerts/8.8.0', {

diff --git a/...on_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/saved_query.ts b/...on_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/saved_query.ts
@@ -43,7 +43,7 @@ export default ({ getService }: FtrProviderContext) => {
   const dataPathBuilder = new EsArchivePathBuilder(isServerless);
   const path = dataPathBuilder.getPath('auditbeat/hosts');
 
-  describe('@ess @serverless Saved query type rules', () => {
+  describe('@ess @serverless @serverlessQA Saved query type rules', () => {
     before(async () => {
       await esArchiver.load(path);
     });

diff --git a/...n_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/threat_match.ts b/...n_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/threat_match.ts
@@ -159,7 +159,7 @@ export default ({ getService }: FtrProviderContext) => {
    * Specific api integration tests for threat matching rule type
    */
   // FLAKY: https://github.com/elastic/kibana/issues/155304
-  describe('@ess @serverless Threat match type rules', () => {
+  describe('@ess @serverless @serverlessQA Threat match type rules', () => {
     before(async () => {
       await esArchiver.load(audibeatHostsPath);
     });

diff --git a/...ution_logic/trial_license_complete_tier/execution_logic/threat_match_alert_suppression.ts b/...ution_logic/trial_license_complete_tier/execution_logic/threat_match_alert_suppression.ts
@@ -157,7 +157,7 @@ export default ({ getService }: FtrProviderContext) => {
     },
   ];
 
-  describe('@ess @serverless Indicator match type rules, alert suppression', () => {
+  describe('@ess @serverless @serverlessQA Indicator match type rules, alert suppression', () => {
     before(async () => {
       await esArchiver.load('x-pack/test/functional/es_archives/security_solution/ecs_compliant');
     });

diff --git a/...tion_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/threshold.ts b/...tion_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/threshold.ts
@@ -47,7 +47,7 @@ export default ({ getService }: FtrProviderContext) => {
   const dataPathBuilder = new EsArchivePathBuilder(isServerless);
   const path = dataPathBuilder.getPath('auditbeat/hosts');
 
-  describe('@ess @serverless Threshold type rules', () => {
+  describe('@ess @serverless @serverlessQA Threshold type rules', () => {
     before(async () => {
       await esArchiver.load(path);
     });

diff --git a/...xecution_logic/trial_license_complete_tier/execution_logic/threshold_alert_suppression.ts b/...xecution_logic/trial_license_complete_tier/execution_logic/threshold_alert_suppression.ts
@@ -49,7 +49,7 @@ export default ({ getService }: FtrProviderContext) => {
   const dataPathBuilder = new EsArchivePathBuilder(isServerless);
   const path = dataPathBuilder.getPath('auditbeat/hosts');
 
-  describe('@ess @serverless Threshold type rules, alert suppression', () => {
+  describe('@ess @serverless @serverlessQA Threshold type rules, alert suppression', () => {
     const { indexListOfDocuments, indexGeneratedDocuments } = dataGeneratorFactory({
       es,
       index: 'ecs_compliant',

diff --git a/...sponse/detection_engine/rule_execution_logic/trial_license_complete_tier/ignore_fields.ts b/...sponse/detection_engine/rule_execution_logic/trial_license_complete_tier/ignore_fields.ts
@@ -46,7 +46,7 @@ export default ({ getService }: FtrProviderContext): void => {
    * server/lib/detection_engine/signals/source_fields_merging/utils/is_ignored.ts
    * server/lib/detection_engine/signals/source_fields_merging/utils/is_eql_bug_77152.ts
    */
-  describe('@ess @serverless ignore_fields', () => {
+  describe('@ess @serverless @serverlessQA ignore_fields', () => {
     const supertest = getService('supertest');
     const esArchiver = getService('esArchiver');
     const log = getService('log');

diff --git a/...n_engine/rule_execution_logic/trial_license_complete_tier/keyword_family/const_keyword.ts b/...n_engine/rule_execution_logic/trial_license_complete_tier/keyword_family/const_keyword.ts
@@ -31,7 +31,7 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
   const es = getService('es');
 
-  describe('@ess @serverless Rule detects against a keyword of event.dataset', () => {
+  describe('@ess @serverless @serverlessQA Rule detects against a keyword of event.dataset', () => {
     before(async () => {
       await esArchiver.load('x-pack/test/functional/es_archives/rule_keyword_family/const_keyword');
     });

diff --git a/...tection_engine/rule_execution_logic/trial_license_complete_tier/keyword_family/keyword.ts b/...tection_engine/rule_execution_logic/trial_license_complete_tier/keyword_family/keyword.ts
@@ -50,7 +50,7 @@ export default ({ getService }: FtrProviderContext) => {
       await deleteAllRules(supertest, log);
     });
 
-    describe('@ess @serverless "kql" rule type', () => {
+    describe('@ess @serverless @serverlessQA "kql" rule type', () => {
       it('should detect the "dataset_name_1" from "event.dataset"', async () => {
         const rule: QueryRuleCreateProps = {
           ...getRuleForAlertTesting(['keyword']),

diff --git a/...le_execution_logic/trial_license_complete_tier/keyword_family/keyword_mixed_with_const.ts b/...le_execution_logic/trial_license_complete_tier/keyword_family/keyword_mixed_with_const.ts
@@ -31,7 +31,7 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
   const es = getService('es');
 
-  describe('@ess @serverless Rule detects against a keyword and constant_keyword of event.dataset', () => {
+  describe('@ess @serverless @serverlessQA Rule detects against a keyword and constant_keyword of event.dataset', () => {
     before(async () => {
       await esArchiver.load('x-pack/test/functional/es_archives/rule_keyword_family/const_keyword');
       await esArchiver.load('x-pack/test/functional/es_archives/rule_keyword_family/keyword');

diff --git a/...ons_response/detection_engine/rule_execution_logic/trial_license_complete_tier/runtime.ts b/...ons_response/detection_engine/rule_execution_logic/trial_license_complete_tier/runtime.ts
@@ -31,7 +31,7 @@ export default ({ getService }: FtrProviderContext) => {
     hostname: string;
   }
 
-  describe('@ess @serverless Tests involving runtime fields of source indexes and the alerts index', () => {
+  describe('@ess @serverless @serverlessQA Tests involving runtime fields of source indexes and the alerts index', () => {
     before(async () => {
       await esArchiver.load('x-pack/test/functional/es_archives/security_solution/runtime');
     });

diff --git a/..._response/detection_engine/rule_execution_logic/trial_license_complete_tier/timestamps.ts b/..._response/detection_engine/rule_execution_logic/trial_license_complete_tier/timestamps.ts
@@ -44,7 +44,7 @@ export default ({ getService }: FtrProviderContext) => {
    * the "signal.original_time" field, ensuring that timestamp overrides operate, and ensuring that
    * partial errors happen correctly
    */
-  describe('@ess @serverless timestamp tests', () => {
+  describe('@ess @serverless @serverlessQA timestamp tests', () => {
     describe('alerts generated from events with a timestamp in seconds is converted correctly into the forced ISO8601 format when copying', () => {
       beforeEach(async () => {
         await createAlertsIndex(supertest, log);