replace mochaOps with suiteTags

mgiota · Jul 9, 2024 · d2c5096 · d2c5096
1 parent 778fd0c
commit d2c5096
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/x-pack/test/observability_solution_api_integration/config/ess/config.base.ts b/x-pack/test/observability_solution_api_integration/config/ess/config.base.ts
@@ -28,8 +28,9 @@ export function createTestConfig(options: CreateTestConfigOptions) {
       junit: {
         reportName: 'X-Pack Οbservability Solution API Integration Tests',
       },
-      mochaOpts: {
-        grep: '/^(?!.*@skipInEss).*@ess.*/',
+      suiteTags: {
+        include: ['myIncludeEssTag'],
+        exclude: ['myExcludeEssTag'],
       },
       kbnTestServer: {
         ...xPackApiIntegrationTestsConfig.get('kbnTestServer'),

diff --git a/x-pack/test/observability_solution_api_integration/config/serverless/config.base.ts b/x-pack/test/observability_solution_api_integration/config/serverless/config.base.ts
@@ -30,9 +30,9 @@ export function createTestConfig(options: CreateTestConfigOptions) {
       },
       testFiles: options.testFiles,
       junit: options.junit,
-      mochaOpts: {
-        ...svlSharedConfig.get('mochaOpts'),
-        grep: '/^(?!.*@skipInServerless).*@serverless.*/',
+      suiteTags: {
+        include: ['myIncludeServerlessTag'],
+        exclude: ['myExcludeServerlessTag'],
       },
     };
   };

diff --git a/x-pack/test/observability_solution_api_integration/package.json b/x-pack/test/observability_solution_api_integration/package.json
@@ -6,12 +6,12 @@
   "license": "Elastic License 2.0",
   "scripts": {
     "alerting_burn_rate:server:serverless": "node ../../../scripts/functional_tests_server.js --config ./test_suites/alerting/burn_rate/configs/serverless.config.ts",
-    "alerting_burn_rate:runner:serverless": "node ../../../scripts/functional_test_runner --config=test_suites/alerting/burn_rate/configs/serverless.config.ts --grep @serverless --grep  @skipInServerless --invert",
+    "alerting_burn_rate:runner:serverless": "node ../../../scripts/functional_test_runner --config=test_suites/alerting/burn_rate/configs/serverless.config.ts",
     "alerting_burn_rate:server:ess": "node ../../../scripts/functional_tests_server.js --config ./test_suites/alerting/burn_rate/configs/ess.config.ts",
-    "alerting_burn_rate:runner:ess": "node ../../../scripts/functional_test_runner --config=test_suites/alerting/burn_rate/configs/ess.config.ts --grep @ess --grep  @skipInEss --invert",
+    "alerting_burn_rate:runner:ess": "node ../../../scripts/functional_test_runner --config=test_suites/alerting/burn_rate/configs/ess.config.ts",
     "alerting_custom_threshold:server:serverless": "node ../../../scripts/functional_tests_server.js --config ./test_suites/alerting/custom_threshold/configs/serverless.config.ts",
-    "alerting_custom_threshold:runner:serverless": "node ../../../scripts/functional_test_runner --config=test_suites/alerting/custom_threshold/configs/serverless.config.ts --grep @serverless --grep  @skipInServerless --invert",
+    "alerting_custom_threshold:runner:serverless": "node ../../../scripts/functional_test_runner --config=test_suites/alerting/custom_threshold/configs/serverless.config.ts",
     "alerting_custom_threshold:server:ess": "node ../../../scripts/functional_tests_server.js --config ./test_suites/alerting/custom_threshold/configs/ess.config.ts",
-    "alerting_custom_threshold:runner:ess": "node ../../../scripts/functional_test_runner --config=test_suites/alerting/custom_threshold/configs/ess.config.ts --grep @ess --grep  @skipInEss --invert"
+    "alerting_custom_threshold:runner:ess": "node ../../../scripts/functional_test_runner --config=test_suites/alerting/custom_threshold/configs/ess.config.ts"
   }
 }
diff --git a/...t/observability_solution_api_integration/test_suites/alerting/burn_rate/burn_rate_rule.ts b/...t/observability_solution_api_integration/test_suites/alerting/burn_rate/burn_rate_rule.ts
@@ -21,7 +21,7 @@ export default function ({ getService }: FtrProviderContext) {
   const isServerless = config.get('serverless');
   const expectedConsumer = isServerless ? 'observability' : 'slo';
 
-  describe('@serverless @ess Burn rate rule', () => {
+  describe('Burn rate rule', () => {
     const RULE_TYPE_ID = 'slo.rules.burnRate';
     const DATA_VIEW = 'kbn-data-forge-fake_hosts.fake_hosts-*';
     const RULE_ALERT_INDEX = '.alerts-observability.slo.alerts-default';

diff --git a/...lity_solution_api_integration/test_suites/alerting/burn_rate/configs/serverless.config.ts b/...lity_solution_api_integration/test_suites/alerting/burn_rate/configs/serverless.config.ts
@@ -10,6 +10,6 @@ import { createTestConfig } from '../../../../config/serverless/config.base';
 export default createTestConfig({
   testFiles: [require.resolve('..')],
   junit: {
-    reportName: 'SLO - Integration Tests - Serverless Env',
+    reportName: 'SLO - Burn rate Integration Tests - Serverless Env',
   },
 });
diff --git a/x-pack/test/observability_solution_api_integration/test_suites/alerting/burn_rate/index.ts b/x-pack/test/observability_solution_api_integration/test_suites/alerting/burn_rate/index.ts
@@ -9,6 +9,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('Slo - Burn rate rule', function () {
+    this.tags(['myIncludeServerlessTag', 'myIncludeEssTag']);
     loadTestFile(require.resolve('./burn_rate_rule'));
   });
 }