Skip to content

Commit aa563a4

Browse files
dmlemeshkoakowalska622
authored andcommitted
[ftr] split svl common configs with 4 extra groups (elastic#218415)
## Summary These 2 configs for all solutions take 35-39 minutes: ``` x-pack/test_serverless/functional/test_suites/<solution>/common_configs/config.group5.ts x-pack/test_serverless/functional/test_suites/<solution>/common_configs/config.group6.ts ``` I added 4 additional groups under each solution and relocated some configs to split original runtime by ~3: ``` x-pack/test_serverless/functional/test_suites/<solution>/common_configs/config.group9.ts x-pack/test_serverless/functional/test_suites/<solution>/common_configs/config.group10.ts x-pack/test_serverless/functional/test_suites/<solution>/common_configs/config.group11.ts x-pack/test_serverless/functional/test_suites/<solution>/common_configs/config.group12.ts ``` It should help balancing configs better and retry failed ones faster. After this PR groups runtime |config path| runtime | | ------------- | ------------- | |x-pack/test_serverless/functional/test_suites/security/common_configs/config.group5.ts| 16m 15s | |x-pack/test_serverless/functional/test_suites/security/common_configs/config.group6.ts| 18m 7s | |x-pack/test_serverless/functional/test_suites/security/common_configs/config.group9.ts| 12m 7s | |x-pack/test_serverless/functional/test_suites/security/common_configs/config.group10.ts | 16m 13s | |x-pack/test_serverless/functional/test_suites/security/common_configs/config.group11.ts| 14m 3s | |x-pack/test_serverless/functional/test_suites/security/common_configs/config.group12.ts| 17m 47s |
1 parent c3485f6 commit aa563a4

20 files changed

+281
-22
lines changed

.buildkite/ftr_oblt_serverless_configs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ enabled:
2727
- x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group6.ts
2828
- x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group7.ts
2929
- x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group8.ts
30+
- x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group9.ts
31+
- x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group10.ts
32+
- x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group11.ts
33+
- x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group12.ts
3034
- x-pack/test_serverless/functional/test_suites/observability/config.screenshots.ts
3135
- x-pack/test_serverless/functional/test_suites/observability/config.telemetry.ts
3236
# serverless config files that run deployment-agnostic tests

.buildkite/ftr_search_serverless_configs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,9 @@ enabled:
2121
- x-pack/test_serverless/functional/test_suites/search/common_configs/config.group6.ts
2222
- x-pack/test_serverless/functional/test_suites/search/common_configs/config.group7.ts
2323
- x-pack/test_serverless/functional/test_suites/search/common_configs/config.group8.ts
24+
- x-pack/test_serverless/functional/test_suites/search/common_configs/config.group9.ts
25+
- x-pack/test_serverless/functional/test_suites/search/common_configs/config.group10.ts
26+
- x-pack/test_serverless/functional/test_suites/search/common_configs/config.group11.ts
27+
- x-pack/test_serverless/functional/test_suites/search/common_configs/config.group12.ts
2428
# serverless config files that run deployment-agnostic tests
2529
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/search.serverless.config.ts

.buildkite/ftr_security_serverless_configs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ enabled:
4949
- x-pack/test_serverless/functional/test_suites/security/common_configs/config.group6.ts
5050
- x-pack/test_serverless/functional/test_suites/security/common_configs/config.group7.ts
5151
- x-pack/test_serverless/functional/test_suites/security/common_configs/config.group8.ts
52+
- x-pack/test_serverless/functional/test_suites/security/common_configs/config.group9.ts
53+
- x-pack/test_serverless/functional/test_suites/security/common_configs/config.group10.ts
54+
- x-pack/test_serverless/functional/test_suites/security/common_configs/config.group11.ts
55+
- x-pack/test_serverless/functional/test_suites/security/common_configs/config.group12.ts
5256
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/configs/serverless.config.ts
5357
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/configs/serverless.config.ts
5458
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/trial_license_complete_tier/configs/serverless.config.ts
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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 { FtrConfigProviderContext } from '@kbn/test';
9+
10+
export default async function ({ readConfigFile }: FtrConfigProviderContext) {
11+
const baseTestConfig = await readConfigFile(require.resolve('../config.ts'));
12+
13+
return {
14+
...baseTestConfig.getAll(),
15+
testFiles: [
16+
require.resolve('../../common/context'),
17+
require.resolve('../../common/discover/esql'),
18+
],
19+
junit: {
20+
reportName: 'Serverless Observability Functional Tests - Common Group 6',
21+
},
22+
};
23+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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 { FtrConfigProviderContext } from '@kbn/test';
9+
10+
export default async function ({ readConfigFile }: FtrConfigProviderContext) {
11+
const baseTestConfig = await readConfigFile(require.resolve('../config.ts'));
12+
13+
return {
14+
...baseTestConfig.getAll(),
15+
testFiles: [
16+
require.resolve('../../common/discover/group3'),
17+
require.resolve('../../common/discover/group4'),
18+
require.resolve('../../common/discover/group5'),
19+
],
20+
junit: {
21+
reportName: 'Serverless Observability Functional Tests - Common Group 11',
22+
},
23+
};
24+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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 { FtrConfigProviderContext } from '@kbn/test';
9+
10+
export default async function ({ readConfigFile }: FtrConfigProviderContext) {
11+
const baseTestConfig = await readConfigFile(require.resolve('../config.ts'));
12+
13+
return {
14+
...baseTestConfig.getAll(),
15+
testFiles: [require.resolve('../../common/discover/group6')],
16+
junit: {
17+
reportName: 'Serverless Observability Functional Tests - Common Group 12',
18+
},
19+
};
20+
}

x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group5.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
1515
testFiles: [
1616
require.resolve('../../common/discover/group1'),
1717
require.resolve('../../common/discover/group2'),
18-
require.resolve('../../common/discover/group3'),
19-
require.resolve('../../common/discover/group4'),
20-
require.resolve('../../common/discover/group5'),
21-
require.resolve('../../common/discover/group6'),
2218
],
2319
junit: {
2420
reportName: 'Serverless Observability Functional Tests - Common Group 5',

x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group6.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
1515
testFiles: [
1616
require.resolve('../../common/discover/embeddable'),
1717
require.resolve('../../common/discover/x_pack'),
18-
require.resolve('../../common/discover_ml_uptime/discover'),
19-
require.resolve('../../common/context'),
20-
require.resolve('../../common/discover/esql'),
2118
],
2219
junit: {
2320
reportName: 'Serverless Observability Functional Tests - Common Group 6',
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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 { FtrConfigProviderContext } from '@kbn/test';
9+
10+
export default async function ({ readConfigFile }: FtrConfigProviderContext) {
11+
const baseTestConfig = await readConfigFile(require.resolve('../config.ts'));
12+
13+
return {
14+
...baseTestConfig.getAll(),
15+
testFiles: [require.resolve('../../common/discover_ml_uptime/discover')],
16+
junit: {
17+
reportName: 'Serverless Observability Functional Tests - Common Group 6',
18+
},
19+
};
20+
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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 { FtrConfigProviderContext } from '@kbn/test';
9+
10+
export default async function ({ readConfigFile }: FtrConfigProviderContext) {
11+
const baseTestConfig = await readConfigFile(require.resolve('../config.ts'));
12+
13+
return {
14+
...baseTestConfig.getAll(),
15+
testFiles: [
16+
require.resolve('../../common/context'),
17+
require.resolve('../../common/discover/esql'),
18+
],
19+
junit: {
20+
reportName: 'Serverless Search Functional Tests - Common Group 10',
21+
},
22+
};
23+
}

0 commit comments

Comments
 (0)