[ftr][deployment-agnostic] move APM tests in its own config file

.buildkite/ftr_oblt_serverless_configs.yml

@@ -27,3 +27,4 @@ enabled:
   - 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

.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

x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.apm.index.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 { DeploymentAgnosticFtrProviderContext } from '../../ftr_provider_context';
+
+export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext) {
+  describe('Serverless Observability - Deployment-agnostic APM API integration tests', function () {
+    this.tags(['esGate']);
+
+    // load new oblt APM-only deployment-agnostic test here
+    loadTestFile(require.resolve('../../apis/observability/apm'));
+  });
+}

x-pack/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',
+  },
+});

x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.index.ts

@@ -7,10 +7,10 @@
 import { DeploymentAgnosticFtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext) {
-  describe('Serverless Observability - Deployment-agnostic api integration tests', function () {
+  describe('Serverless Observability - Deployment-agnostic API integration tests', function () {
     this.tags(['esGate']);
 
-    // load new oblt and platform deployment-agnostic test here
+    // 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'));
@@ -20,6 +20,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'));
   });
 }

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'));
+  });
+}

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',
+  },
+});

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'));
   });
 }