From 376f7889fabe7407d56485bea0dcd2386112856a Mon Sep 17 00:00:00 2001 From: Dzmitry Lemechko Date: Wed, 16 Apr 2025 13:31:54 +0200 Subject: [PATCH] [ftr] split svl common configs with 4 extra groups --- .buildkite/ftr_oblt_serverless_configs.yml | 4 ++++ .buildkite/ftr_search_serverless_configs.yml | 4 ++++ .../ftr_security_serverless_configs.yml | 4 ++++ .../common_configs/config.group10.ts | 23 ++++++++++++++++++ .../common_configs/config.group11.ts | 24 +++++++++++++++++++ .../common_configs/config.group12.ts | 20 ++++++++++++++++ .../common_configs/config.group5.ts | 4 ---- .../common_configs/config.group6.ts | 3 --- .../common_configs/config.group9.ts | 20 ++++++++++++++++ .../search/common_configs/config.group10.ts | 23 ++++++++++++++++++ .../search/common_configs/config.group11.ts | 24 +++++++++++++++++++ .../search/common_configs/config.group12.ts | 22 +++++++++++++++++ .../search/common_configs/config.group5.ts | 8 ++----- .../search/common_configs/config.group9.ts | 20 ++++++++++++++++ .../security/common_configs/config.group10.ts | 23 ++++++++++++++++++ .../security/common_configs/config.group11.ts | 24 +++++++++++++++++++ .../security/common_configs/config.group12.ts | 20 ++++++++++++++++ .../security/common_configs/config.group5.ts | 4 ---- .../security/common_configs/config.group6.ts | 7 ++---- .../security/common_configs/config.group9.ts | 22 +++++++++++++++++ 20 files changed, 281 insertions(+), 22 deletions(-) create mode 100644 x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group10.ts create mode 100644 x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group11.ts create mode 100644 x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group12.ts create mode 100644 x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group9.ts create mode 100644 x-pack/test_serverless/functional/test_suites/search/common_configs/config.group10.ts create mode 100644 x-pack/test_serverless/functional/test_suites/search/common_configs/config.group11.ts create mode 100644 x-pack/test_serverless/functional/test_suites/search/common_configs/config.group12.ts create mode 100644 x-pack/test_serverless/functional/test_suites/search/common_configs/config.group9.ts create mode 100644 x-pack/test_serverless/functional/test_suites/security/common_configs/config.group10.ts create mode 100644 x-pack/test_serverless/functional/test_suites/security/common_configs/config.group11.ts create mode 100644 x-pack/test_serverless/functional/test_suites/security/common_configs/config.group12.ts create mode 100644 x-pack/test_serverless/functional/test_suites/security/common_configs/config.group9.ts diff --git a/.buildkite/ftr_oblt_serverless_configs.yml b/.buildkite/ftr_oblt_serverless_configs.yml index 8910813c63cf0..e57c0c29bd566 100644 --- a/.buildkite/ftr_oblt_serverless_configs.yml +++ b/.buildkite/ftr_oblt_serverless_configs.yml @@ -27,6 +27,10 @@ enabled: - x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group6.ts - x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group7.ts - x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group8.ts + - x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group9.ts + - x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group10.ts + - x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group11.ts + - x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group12.ts - x-pack/test_serverless/functional/test_suites/observability/config.screenshots.ts - x-pack/test_serverless/functional/test_suites/observability/config.telemetry.ts # serverless config files that run deployment-agnostic tests diff --git a/.buildkite/ftr_search_serverless_configs.yml b/.buildkite/ftr_search_serverless_configs.yml index 0447650a9cda7..2ac1b5e1a0033 100644 --- a/.buildkite/ftr_search_serverless_configs.yml +++ b/.buildkite/ftr_search_serverless_configs.yml @@ -21,5 +21,9 @@ enabled: - x-pack/test_serverless/functional/test_suites/search/common_configs/config.group6.ts - x-pack/test_serverless/functional/test_suites/search/common_configs/config.group7.ts - x-pack/test_serverless/functional/test_suites/search/common_configs/config.group8.ts + - x-pack/test_serverless/functional/test_suites/search/common_configs/config.group9.ts + - x-pack/test_serverless/functional/test_suites/search/common_configs/config.group10.ts + - x-pack/test_serverless/functional/test_suites/search/common_configs/config.group11.ts + - x-pack/test_serverless/functional/test_suites/search/common_configs/config.group12.ts # serverless config files that run deployment-agnostic tests - x-pack/test/api_integration/deployment_agnostic/configs/serverless/search.serverless.config.ts diff --git a/.buildkite/ftr_security_serverless_configs.yml b/.buildkite/ftr_security_serverless_configs.yml index db5d959d007f5..1242a096efd3a 100644 --- a/.buildkite/ftr_security_serverless_configs.yml +++ b/.buildkite/ftr_security_serverless_configs.yml @@ -49,6 +49,10 @@ enabled: - x-pack/test_serverless/functional/test_suites/security/common_configs/config.group6.ts - x-pack/test_serverless/functional/test_suites/security/common_configs/config.group7.ts - x-pack/test_serverless/functional/test_suites/security/common_configs/config.group8.ts + - x-pack/test_serverless/functional/test_suites/security/common_configs/config.group9.ts + - x-pack/test_serverless/functional/test_suites/security/common_configs/config.group10.ts + - x-pack/test_serverless/functional/test_suites/security/common_configs/config.group11.ts + - x-pack/test_serverless/functional/test_suites/security/common_configs/config.group12.ts - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/configs/serverless.config.ts - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/configs/serverless.config.ts - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/trial_license_complete_tier/configs/serverless.config.ts diff --git a/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group10.ts b/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group10.ts new file mode 100644 index 0000000000000..a4bd8115e002e --- /dev/null +++ b/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group10.ts @@ -0,0 +1,23 @@ +/* + * 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 { FtrConfigProviderContext } from '@kbn/test'; + +export default async function ({ readConfigFile }: FtrConfigProviderContext) { + const baseTestConfig = await readConfigFile(require.resolve('../config.ts')); + + return { + ...baseTestConfig.getAll(), + testFiles: [ + require.resolve('../../common/context'), + require.resolve('../../common/discover/esql'), + ], + junit: { + reportName: 'Serverless Observability Functional Tests - Common Group 6', + }, + }; +} diff --git a/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group11.ts b/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group11.ts new file mode 100644 index 0000000000000..9df8f74ba0918 --- /dev/null +++ b/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group11.ts @@ -0,0 +1,24 @@ +/* + * 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 { FtrConfigProviderContext } from '@kbn/test'; + +export default async function ({ readConfigFile }: FtrConfigProviderContext) { + const baseTestConfig = await readConfigFile(require.resolve('../config.ts')); + + return { + ...baseTestConfig.getAll(), + testFiles: [ + require.resolve('../../common/discover/group3'), + require.resolve('../../common/discover/group4'), + require.resolve('../../common/discover/group5'), + ], + junit: { + reportName: 'Serverless Observability Functional Tests - Common Group 11', + }, + }; +} diff --git a/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group12.ts b/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group12.ts new file mode 100644 index 0000000000000..7eca291adabb6 --- /dev/null +++ b/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group12.ts @@ -0,0 +1,20 @@ +/* + * 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 { FtrConfigProviderContext } from '@kbn/test'; + +export default async function ({ readConfigFile }: FtrConfigProviderContext) { + const baseTestConfig = await readConfigFile(require.resolve('../config.ts')); + + return { + ...baseTestConfig.getAll(), + testFiles: [require.resolve('../../common/discover/group6')], + junit: { + reportName: 'Serverless Observability Functional Tests - Common Group 12', + }, + }; +} diff --git a/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group5.ts b/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group5.ts index be3c0098d35d2..59a72cd57293b 100644 --- a/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group5.ts +++ b/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group5.ts @@ -15,10 +15,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { testFiles: [ require.resolve('../../common/discover/group1'), require.resolve('../../common/discover/group2'), - require.resolve('../../common/discover/group3'), - require.resolve('../../common/discover/group4'), - require.resolve('../../common/discover/group5'), - require.resolve('../../common/discover/group6'), ], junit: { reportName: 'Serverless Observability Functional Tests - Common Group 5', diff --git a/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group6.ts b/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group6.ts index be9fb04bb40b8..fc2a89ec8a964 100644 --- a/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group6.ts +++ b/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group6.ts @@ -15,9 +15,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { testFiles: [ require.resolve('../../common/discover/embeddable'), require.resolve('../../common/discover/x_pack'), - require.resolve('../../common/discover_ml_uptime/discover'), - require.resolve('../../common/context'), - require.resolve('../../common/discover/esql'), ], junit: { reportName: 'Serverless Observability Functional Tests - Common Group 6', diff --git a/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group9.ts b/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group9.ts new file mode 100644 index 0000000000000..78c9f4237a52b --- /dev/null +++ b/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group9.ts @@ -0,0 +1,20 @@ +/* + * 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 { FtrConfigProviderContext } from '@kbn/test'; + +export default async function ({ readConfigFile }: FtrConfigProviderContext) { + const baseTestConfig = await readConfigFile(require.resolve('../config.ts')); + + return { + ...baseTestConfig.getAll(), + testFiles: [require.resolve('../../common/discover_ml_uptime/discover')], + junit: { + reportName: 'Serverless Observability Functional Tests - Common Group 6', + }, + }; +} diff --git a/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group10.ts b/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group10.ts new file mode 100644 index 0000000000000..db8ddac5b7cbc --- /dev/null +++ b/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group10.ts @@ -0,0 +1,23 @@ +/* + * 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 { FtrConfigProviderContext } from '@kbn/test'; + +export default async function ({ readConfigFile }: FtrConfigProviderContext) { + const baseTestConfig = await readConfigFile(require.resolve('../config.ts')); + + return { + ...baseTestConfig.getAll(), + testFiles: [ + require.resolve('../../common/context'), + require.resolve('../../common/discover/esql'), + ], + junit: { + reportName: 'Serverless Search Functional Tests - Common Group 10', + }, + }; +} diff --git a/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group11.ts b/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group11.ts new file mode 100644 index 0000000000000..10fc010b4e282 --- /dev/null +++ b/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group11.ts @@ -0,0 +1,24 @@ +/* + * 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 { FtrConfigProviderContext } from '@kbn/test'; + +export default async function ({ readConfigFile }: FtrConfigProviderContext) { + const baseTestConfig = await readConfigFile(require.resolve('../config.ts')); + + return { + ...baseTestConfig.getAll(), + testFiles: [ + require.resolve('../../common/discover/group3'), // 4 min + require.resolve('../../common/discover/group4'), // 4 min + require.resolve('../../common/discover/group5'), // 2 min + ], + junit: { + reportName: 'Serverless Search Functional Tests - Common Group 11', + }, + }; +} diff --git a/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group12.ts b/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group12.ts new file mode 100644 index 0000000000000..88f9a8fbf6147 --- /dev/null +++ b/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group12.ts @@ -0,0 +1,22 @@ +/* + * 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 { FtrConfigProviderContext } from '@kbn/test'; + +export default async function ({ readConfigFile }: FtrConfigProviderContext) { + const baseTestConfig = await readConfigFile(require.resolve('../config.ts')); + + return { + ...baseTestConfig.getAll(), + testFiles: [ + require.resolve('../../common/discover/group6'), // 13 min + ], + junit: { + reportName: 'Serverless Search Functional Tests - Common Group 12', + }, + }; +} diff --git a/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group5.ts b/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group5.ts index ad661b474a33d..072c1c16e1e6a 100644 --- a/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group5.ts +++ b/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group5.ts @@ -13,12 +13,8 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { return { ...baseTestConfig.getAll(), testFiles: [ - require.resolve('../../common/discover/group1'), - require.resolve('../../common/discover/group2'), - require.resolve('../../common/discover/group3'), - require.resolve('../../common/discover/group4'), - require.resolve('../../common/discover/group5'), - require.resolve('../../common/discover/group6'), + require.resolve('../../common/discover/group1'), // 7 min + require.resolve('../../common/discover/group2'), // 4 min ], junit: { reportName: 'Serverless Search Functional Tests - Common Group 5', diff --git a/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group9.ts b/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group9.ts new file mode 100644 index 0000000000000..b1c4e282c29b9 --- /dev/null +++ b/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group9.ts @@ -0,0 +1,20 @@ +/* + * 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 { FtrConfigProviderContext } from '@kbn/test'; + +export default async function ({ readConfigFile }: FtrConfigProviderContext) { + const baseTestConfig = await readConfigFile(require.resolve('../config.ts')); + + return { + ...baseTestConfig.getAll(), + testFiles: [require.resolve('../../common/discover_ml_uptime/discover')], + junit: { + reportName: 'Serverless Search Functional Tests - Common Group 9', + }, + }; +} diff --git a/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group10.ts b/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group10.ts new file mode 100644 index 0000000000000..b80d189bd78dc --- /dev/null +++ b/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group10.ts @@ -0,0 +1,23 @@ +/* + * 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 { FtrConfigProviderContext } from '@kbn/test'; + +export default async function ({ readConfigFile }: FtrConfigProviderContext) { + const baseTestConfig = await readConfigFile(require.resolve('../config.ts')); + + return { + ...baseTestConfig.getAll(), + testFiles: [ + require.resolve('../../common/context'), // 5 min + require.resolve('../../common/discover/esql'), // 7 min + ], + junit: { + reportName: 'Serverless Security Functional Tests - Common Group 10', + }, + }; +} diff --git a/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group11.ts b/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group11.ts new file mode 100644 index 0000000000000..a7c6b5ad1fc8c --- /dev/null +++ b/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group11.ts @@ -0,0 +1,24 @@ +/* + * 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 { FtrConfigProviderContext } from '@kbn/test'; + +export default async function ({ readConfigFile }: FtrConfigProviderContext) { + const baseTestConfig = await readConfigFile(require.resolve('../config.ts')); + + return { + ...baseTestConfig.getAll(), + testFiles: [ + require.resolve('../../common/discover/group3'), + require.resolve('../../common/discover/group4'), + require.resolve('../../common/discover/group5'), + ], + junit: { + reportName: 'Serverless Security Functional Tests - Common Group 11', + }, + }; +} diff --git a/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group12.ts b/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group12.ts new file mode 100644 index 0000000000000..41802c0925b86 --- /dev/null +++ b/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group12.ts @@ -0,0 +1,20 @@ +/* + * 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 { FtrConfigProviderContext } from '@kbn/test'; + +export default async function ({ readConfigFile }: FtrConfigProviderContext) { + const baseTestConfig = await readConfigFile(require.resolve('../config.ts')); + + return { + ...baseTestConfig.getAll(), + testFiles: [require.resolve('../../common/discover/group6')], + junit: { + reportName: 'Serverless Security Functional Tests - Common Group 12', + }, + }; +} diff --git a/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group5.ts b/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group5.ts index c65131e27e9e8..62b174b0ad939 100644 --- a/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group5.ts +++ b/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group5.ts @@ -15,10 +15,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { testFiles: [ require.resolve('../../common/discover/group1'), require.resolve('../../common/discover/group2'), - require.resolve('../../common/discover/group3'), - require.resolve('../../common/discover/group4'), - require.resolve('../../common/discover/group5'), - require.resolve('../../common/discover/group6'), ], junit: { reportName: 'Serverless Security Functional Tests - Common Group 5', diff --git a/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group6.ts b/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group6.ts index 844c2de320534..216047b4e3e4d 100644 --- a/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group6.ts +++ b/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group6.ts @@ -13,11 +13,8 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { return { ...baseTestConfig.getAll(), testFiles: [ - require.resolve('../../common/discover/embeddable'), - require.resolve('../../common/discover/x_pack'), - require.resolve('../../common/discover_ml_uptime/discover'), - require.resolve('../../common/context'), - require.resolve('../../common/discover/esql'), + require.resolve('../../common/discover/embeddable'), // 6 min + require.resolve('../../common/discover/x_pack'), // 8 min ], junit: { reportName: 'Serverless Security Functional Tests - Common Group 6', diff --git a/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group9.ts b/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group9.ts new file mode 100644 index 0000000000000..5bf27df411968 --- /dev/null +++ b/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group9.ts @@ -0,0 +1,22 @@ +/* + * 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 { FtrConfigProviderContext } from '@kbn/test'; + +export default async function ({ readConfigFile }: FtrConfigProviderContext) { + const baseTestConfig = await readConfigFile(require.resolve('../config.ts')); + + return { + ...baseTestConfig.getAll(), + testFiles: [ + require.resolve('../../common/discover_ml_uptime/discover'), // 8 min + ], + junit: { + reportName: 'Serverless Security Functional Tests - Common Group 9', + }, + }; +}