Skip to content

Commit 92623b4

Browse files
authored
[8.x] [ftr] split oblt DA configs to speedup CI (elastic#217452) (elastic#217632)
# Backport This will backport the following commits from `main` to `8.x`: - [[ftr] split oblt DA configs to speedup CI (elastic#217452)](elastic#217452) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Dzmitry Lemechko","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-04-08T13:14:58Z","message":"[ftr] split oblt DA configs to speedup CI (elastic#217452)\n\n## Summary\n\nSplitting the following config:\n\n-\nx-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts\n**~61 min**\n\nby moving `ai_assistant`, `synthetics` and `streams` tests in its own\nconfigs\n\n-\nx-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.ai_assistant.serverless.config.ts\n~11m 30s\n-\nx-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.synthetics.serverless.config.ts\n~21m 30s\n-\nx-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.streams.serverless.config.ts\n~21m 43s\n\noriginal config with less tests:\n-\nx-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts\n~17 min","sha":"aa9be6a62148ae83e0ae5ffd4b2aef89d977329c","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","FTR","backport:version","v9.1.0","v8.19.0","v9.0.1"],"title":"[ftr] split oblt DA configs to speedup CI","number":217452,"url":"https://github.com/elastic/kibana/pull/217452","mergeCommit":{"message":"[ftr] split oblt DA configs to speedup CI (elastic#217452)\n\n## Summary\n\nSplitting the following config:\n\n-\nx-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts\n**~61 min**\n\nby moving `ai_assistant`, `synthetics` and `streams` tests in its own\nconfigs\n\n-\nx-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.ai_assistant.serverless.config.ts\n~11m 30s\n-\nx-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.synthetics.serverless.config.ts\n~21m 30s\n-\nx-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.streams.serverless.config.ts\n~21m 43s\n\noriginal config with less tests:\n-\nx-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts\n~17 min","sha":"aa9be6a62148ae83e0ae5ffd4b2aef89d977329c"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/217452","number":217452,"mergeCommit":{"message":"[ftr] split oblt DA configs to speedup CI (elastic#217452)\n\n## Summary\n\nSplitting the following config:\n\n-\nx-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts\n**~61 min**\n\nby moving `ai_assistant`, `synthetics` and `streams` tests in its own\nconfigs\n\n-\nx-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.ai_assistant.serverless.config.ts\n~11m 30s\n-\nx-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.synthetics.serverless.config.ts\n~21m 30s\n-\nx-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.streams.serverless.config.ts\n~21m 43s\n\noriginal config with less tests:\n-\nx-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts\n~17 min","sha":"aa9be6a62148ae83e0ae5ffd4b2aef89d977329c"}},{"branch":"8.x","label":"v8.19.0","branchLabelMappingKey":"^v8.19.0$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.0","label":"v9.0.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/217631","number":217631,"state":"OPEN"}]}] BACKPORT-->
1 parent d882e4b commit 92623b4

File tree

8 files changed

+98
-4
lines changed

8 files changed

+98
-4
lines changed

.buildkite/ftr_oblt_serverless_configs.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ disabled:
2525
- x-pack/test_serverless/functional/test_suites/observability/config.telemetry.ts
2626
# serverless config files that run deployment-agnostic tests
2727
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts
28+
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.ai_assistant.serverless.config.ts
2829
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.apm.serverless.config.ts
30+
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.synthetics.serverless.config.ts
31+
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.streams.serverless.config.ts
2932

3033
# Serverless tests only run on main
3134
defaultQueue: 'n2-4-spot'
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License
4+
* 2.0; you may not use this file except in compliance with the Elastic License
5+
* 2.0.
6+
*/
7+
import { DeploymentAgnosticFtrProviderContext } from '../../ftr_provider_context';
8+
9+
export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext) {
10+
describe('Serverless Observability - Deployment-agnostic APM API integration tests', function () {
11+
this.tags(['esGate']);
12+
13+
loadTestFile(require.resolve('../../apis/observability/ai_assistant'));
14+
});
15+
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License
4+
* 2.0; you may not use this file except in compliance with the Elastic License
5+
* 2.0.
6+
*/
7+
8+
import { createServerlessTestConfig } from '../../default_configs/serverless.config.base';
9+
10+
export default createServerlessTestConfig({
11+
serverlessProject: 'oblt',
12+
testFiles: [require.resolve('./oblt.ai_assistant.index.ts')],
13+
junit: {
14+
reportName: 'Serverless Observability - Deployment-agnostic API Integration Tests',
15+
},
16+
});

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import { DeploymentAgnosticFtrProviderContext } from '../../ftr_provider_context
88

99
export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext) {
1010
describe('Serverless Observability - Deployment-agnostic API integration tests', function () {
11-
// load new oblt (except APM) and platform deployment-agnostic test here
11+
// load new oblt and platform deployment-agnostic test here
12+
// Note: if your tests runtime is over 5 minutes, create a new index and config file
1213
loadTestFile(require.resolve('../../apis/console'));
1314
loadTestFile(require.resolve('../../apis/core'));
1415
loadTestFile(require.resolve('../../apis/management'));
@@ -18,8 +19,5 @@ export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext)
1819
loadTestFile(require.resolve('../../apis/painless_lab'));
1920
loadTestFile(require.resolve('../../apis/saved_objects_management'));
2021
loadTestFile(require.resolve('../../apis/observability/slo'));
21-
loadTestFile(require.resolve('../../apis/observability/synthetics'));
22-
loadTestFile(require.resolve('../../apis/observability/ai_assistant'));
23-
loadTestFile(require.resolve('../../apis/observability/streams'));
2422
});
2523
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License
4+
* 2.0; you may not use this file except in compliance with the Elastic License
5+
* 2.0.
6+
*/
7+
import { DeploymentAgnosticFtrProviderContext } from '../../ftr_provider_context';
8+
9+
export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext) {
10+
describe('Serverless Observability - Deployment-agnostic APM API integration tests', function () {
11+
this.tags(['esGate']);
12+
13+
loadTestFile(require.resolve('../../apis/observability/streams'));
14+
});
15+
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License
4+
* 2.0; you may not use this file except in compliance with the Elastic License
5+
* 2.0.
6+
*/
7+
8+
import { createServerlessTestConfig } from '../../default_configs/serverless.config.base';
9+
10+
export default createServerlessTestConfig({
11+
serverlessProject: 'oblt',
12+
testFiles: [require.resolve('./oblt.streams.index.ts')],
13+
junit: {
14+
reportName: 'Serverless Observability - Deployment-agnostic API Integration Tests',
15+
},
16+
});
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License
4+
* 2.0; you may not use this file except in compliance with the Elastic License
5+
* 2.0.
6+
*/
7+
import { DeploymentAgnosticFtrProviderContext } from '../../ftr_provider_context';
8+
9+
export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext) {
10+
describe('Serverless Observability - Deployment-agnostic APM API integration tests', function () {
11+
this.tags(['esGate']);
12+
13+
loadTestFile(require.resolve('../../apis/observability/synthetics'));
14+
});
15+
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License
4+
* 2.0; you may not use this file except in compliance with the Elastic License
5+
* 2.0.
6+
*/
7+
8+
import { createServerlessTestConfig } from '../../default_configs/serverless.config.base';
9+
10+
export default createServerlessTestConfig({
11+
serverlessProject: 'oblt',
12+
testFiles: [require.resolve('./oblt.synthetics.index.ts')],
13+
junit: {
14+
reportName: 'Serverless Observability - Deployment-agnostic API Integration Tests',
15+
},
16+
});

0 commit comments

Comments
 (0)