[8.17] [8.x] [ftr][deployment-agnostic] move APM tests in its own con…

…fig file (#200562) (#200924) (#203728) # Backport This will backport the following commits from `8.x` to `8.17`: - [[8.x] [ftr][deployment-agnostic] move APM tests in its own config file (#200562) (#200924)](#200924)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) \n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sqren/backport)\n\n","sha":"e1691eb91d710e3ccbb1422176505bf306c8eb44","branchLabelMapping":{"^v8.16.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["backport"],"number":200924,"url":"https://github.com/elastic/kibana/pull/200924","mergeCommit":{"message":"[8.x] [ftr][deployment-agnostic] move APM tests in its own config file (#200562) (#200924)\n\n# Backport\n\nThis will backport the following commits from `main` to `8.x`:\n- [[ftr][deployment-agnostic] move APM tests in its own config file\n(#200562)](https://github.com/elastic/kibana/pull/200562)\n\n\n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sqren/backport)\n\n","sha":"e1691eb91d710e3ccbb1422176505bf306c8eb44"}},"sourceBranch":"8.x","suggestedTargetBranches":[],"targetPullRequestStates":[]}] BACKPORT-->
elastic · Dec 11, 2024 · 86cbc85 · 86cbc85
1 parent 9ff0325
commit 86cbc85
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 6 deletions.
diff --git a/.buildkite/ftr_oblt_serverless_configs.yml b/.buildkite/ftr_oblt_serverless_configs.yml
@@ -24,6 +24,7 @@ disabled:
   - x-pack/test_serverless/functional/test_suites/observability/config.screenshots.ts
   # serverless config files that run deployment-agnostic tests
   - x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts
+  - x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.apm.serverless.config.ts
 
 # Serverless tests only run on main
 defaultQueue: 'n2-4-spot'

diff --git a/.buildkite/ftr_oblt_stateful_configs.yml b/.buildkite/ftr_oblt_stateful_configs.yml
@@ -52,3 +52,4 @@ enabled:
   - x-pack/test/functional/apps/apm/config.ts
   # stateful configs that run deployment-agnostic tests
   - x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts
+  - x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.apm.stateful.config.ts
diff --git a/x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.apm.index.ts b/x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.apm.index.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { DeploymentAgnosticFtrProviderContext } from '../../ftr_provider_context';
+
+export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext) {
+  describe('Serverless Observability - Deployment-agnostic APM API integration tests', function () {
+    // load new oblt APM-only deployment-agnostic test here
+    loadTestFile(require.resolve('../../apis/observability/apm'));
+  });
+}
diff --git a/...test/api_integration/deployment_agnostic/configs/serverless/oblt.apm.serverless.config.ts b/...test/api_integration/deployment_agnostic/configs/serverless/oblt.apm.serverless.config.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { createServerlessTestConfig } from '../../default_configs/serverless.config.base';
+
+export default createServerlessTestConfig({
+  serverlessProject: 'oblt',
+  testFiles: [require.resolve('./oblt.apm.index.ts')],
+  junit: {
+    reportName: 'Serverless Observability - Deployment-agnostic APM API Integration Tests',
+  },
+});
diff --git a/x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.index.ts b/x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.index.ts
@@ -7,8 +7,8 @@
 import { DeploymentAgnosticFtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext) {
-  describe('Serverless Observability - Deployment-agnostic api integration tests', () => {
-    // load new oblt and platform deployment-agnostic test here
+  describe('Serverless Observability - Deployment-agnostic API integration tests', function () {
+    // load new oblt (except APM) and platform deployment-agnostic test here
     loadTestFile(require.resolve('../../apis/console'));
     loadTestFile(require.resolve('../../apis/core'));
     loadTestFile(require.resolve('../../apis/management'));
@@ -18,6 +18,5 @@ export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext)
     loadTestFile(require.resolve('../../apis/painless_lab'));
     loadTestFile(require.resolve('../../apis/saved_objects_management'));
     loadTestFile(require.resolve('../../apis/observability/slo'));
-    loadTestFile(require.resolve('../../apis/observability/apm'));
   });
 }
diff --git a/x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.apm.index.ts b/x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.apm.index.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { DeploymentAgnosticFtrProviderContext } from '../../ftr_provider_context';
+
+export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext) {
+  describe('Stateful Observability - Deployment-agnostic APM API integration tests', () => {
+    loadTestFile(require.resolve('../../apis/observability/apm'));
+  });
+}
diff --git a/x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.apm.stateful.config.ts b/x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.apm.stateful.config.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { createStatefulTestConfig } from '../../default_configs/stateful.config.base';
+
+export default createStatefulTestConfig({
+  testFiles: [require.resolve('./oblt.apm.index.ts')],
+  junit: {
+    reportName: 'Stateful Observability - Deployment-agnostic APM API Integration Tests',
+  },
+});
diff --git a/x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.index.ts b/x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.index.ts
@@ -8,12 +8,11 @@
 import { DeploymentAgnosticFtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext) {
-  describe('apis', () => {
-    // load new oblt deployment-agnostic test here
+  describe('Stateful Observability - Deployment-agnostic API integration tests', () => {
+    // load new oblt (except APM) deployment-agnostic tests here
     loadTestFile(require.resolve('../../apis/observability/alerting'));
     loadTestFile(require.resolve('../../apis/observability/dataset_quality'));
     loadTestFile(require.resolve('../../apis/observability/slo'));
     loadTestFile(require.resolve('../../apis/observability/infra'));
-    loadTestFile(require.resolve('../../apis/observability/apm'));
   });
 }