From e362048c76543bab4fee5749b96e208f7c48dde2 Mon Sep 17 00:00:00 2001 From: mohamedhamed-ahmed Date: Wed, 28 Jan 2026 11:04:58 +0100 Subject: [PATCH 1/8] Use dockerized package registry for serverless --- .../serverless/api_integration/config.base.ts | 17 +++++++++++------ .../test/serverless/functional/config.base.ts | 8 +++++++- .../serverless/functional/config.oblt.base.ts | 1 + .../test/serverless/shared/types/index.ts | 1 + .../api_integration/configs/config.ts | 1 + .../serverless/functional/configs/config.ts | 1 + 6 files changed, 22 insertions(+), 7 deletions(-) diff --git a/x-pack/platform/test/serverless/api_integration/config.base.ts b/x-pack/platform/test/serverless/api_integration/config.base.ts index 3bb1c883a629c..187542d5886f4 100644 --- a/x-pack/platform/test/serverless/api_integration/config.base.ts +++ b/x-pack/platform/test/serverless/api_integration/config.base.ts @@ -4,7 +4,7 @@ * 2.0; you may not use this file except in compliance with the Elastic License * 2.0. */ -import type { FtrConfigProviderContext } from '@kbn/test'; +import { dockerRegistryPort, type FtrConfigProviderContext } from '@kbn/test'; import { ScoutTestRunConfigCategory } from '@kbn/scout-info'; import { MOCK_IDP_UIAM_SERVICE_URL, MOCK_IDP_UIAM_SHARED_SECRET } from '@kbn/mock-idp-utils'; @@ -14,6 +14,7 @@ import type { CreateTestConfigOptions } from '../shared/types'; export function createTestConfig(options: CreateTestConfigOptions) { return async ({ readConfigFile }: FtrConfigProviderContext) => { const svlSharedConfig = await readConfigFile(require.resolve('../shared/config.base.ts')); + const enableFleetDockerRegistry = options.enableFleetDockerRegistry ?? true; return { ...svlSharedConfig.getAll(), @@ -23,6 +24,7 @@ export function createTestConfig(options: CreateTestConfigOptions) { ...services, ...options.services, }, + ...(!enableFleetDockerRegistry && { dockerServers: undefined }), esTestCluster: { ...svlSharedConfig.get('esTestCluster'), serverArgs: [ @@ -43,11 +45,14 @@ export function createTestConfig(options: CreateTestConfigOptions) { ...(options.kbnServerArgs || []), ...(options.esServerlessOptions?.uiam ? [ - '--mockIdpPlugin.uiam.enabled=true', - `--xpack.security.uiam.enabled=true`, - `--xpack.security.uiam.url=${MOCK_IDP_UIAM_SERVICE_URL}`, - `--xpack.security.uiam.sharedSecret=${MOCK_IDP_UIAM_SHARED_SECRET}`, - ] + '--mockIdpPlugin.uiam.enabled=true', + `--xpack.security.uiam.enabled=true`, + `--xpack.security.uiam.url=${MOCK_IDP_UIAM_SERVICE_URL}`, + `--xpack.security.uiam.sharedSecret=${MOCK_IDP_UIAM_SHARED_SECRET}`, + ] + : []), + ...(enableFleetDockerRegistry && dockerRegistryPort + ? [`--xpack.fleet.registryUrl=http://localhost:${dockerRegistryPort}`] : []), ], }, diff --git a/x-pack/platform/test/serverless/functional/config.base.ts b/x-pack/platform/test/serverless/functional/config.base.ts index 54e2f5c6bfc95..8cdef524250cb 100644 --- a/x-pack/platform/test/serverless/functional/config.base.ts +++ b/x-pack/platform/test/serverless/functional/config.base.ts @@ -5,7 +5,7 @@ * 2.0. */ -import type { FtrConfigProviderContext } from '@kbn/test'; +import { dockerRegistryPort, type FtrConfigProviderContext } from '@kbn/test'; import { ScoutTestRunConfigCategory } from '@kbn/scout-info'; import { resolve } from 'path'; import { pageObjects } from './page_objects'; @@ -19,12 +19,15 @@ export function createTestConfig< return async ({ readConfigFile }: FtrConfigProviderContext) => { const svlSharedConfig = await readConfigFile(require.resolve('../shared/config.base.ts')); + const enableFleetDockerRegistry = options.enableFleetDockerRegistry ?? true; + return { ...svlSharedConfig.getAll(), testConfigCategory: ScoutTestRunConfigCategory.UI_TEST, pageObjects: { ...pageObjects, ...options.pageObjects }, services: { ...services, ...options.services }, + ...(!enableFleetDockerRegistry && { dockerServers: undefined }), esTestCluster: { ...svlSharedConfig.get('esTestCluster'), serverArgs: [ @@ -41,6 +44,9 @@ export function createTestConfig< ...(options.kbnServerArgs ?? []), // Disable tours globally for all tests '--uiSettings.globalOverrides.hideAnnouncements=true', + ...(enableFleetDockerRegistry && dockerRegistryPort + ? [`--xpack.fleet.registryUrl=http://localhost:${dockerRegistryPort}`] + : []), ], }, testFiles: options.testFiles, diff --git a/x-pack/platform/test/serverless/functional/config.oblt.base.ts b/x-pack/platform/test/serverless/functional/config.oblt.base.ts index 9fad49de27140..2a107858eefb4 100644 --- a/x-pack/platform/test/serverless/functional/config.oblt.base.ts +++ b/x-pack/platform/test/serverless/functional/config.oblt.base.ts @@ -26,4 +26,5 @@ export default createTestConfig({ `--xpack.dataUsage.autoops.api.tls.certificate=${KBN_CERT_PATH}`, `--xpack.dataUsage.autoops.api.tls.key=${KBN_KEY_PATH}`, ], + enableFleetDockerRegistry: true, }); diff --git a/x-pack/platform/test/serverless/shared/types/index.ts b/x-pack/platform/test/serverless/shared/types/index.ts index bfdfa946f1cc0..ae1addfff799d 100644 --- a/x-pack/platform/test/serverless/shared/types/index.ts +++ b/x-pack/platform/test/serverless/shared/types/index.ts @@ -45,4 +45,5 @@ export interface CreateTestConfigOptions< apps?: Record; screenshots?: { directory: string }; indexRefreshInterval?: string | false; + enableFleetDockerRegistry?: boolean; } diff --git a/x-pack/solutions/observability/test/serverless/api_integration/configs/config.ts b/x-pack/solutions/observability/test/serverless/api_integration/configs/config.ts index adbace3921aea..d64bb5f2fc1a0 100644 --- a/x-pack/solutions/observability/test/serverless/api_integration/configs/config.ts +++ b/x-pack/solutions/observability/test/serverless/api_integration/configs/config.ts @@ -32,4 +32,5 @@ export default createTestConfig({ `--xpack.dataUsage.autoops.api.tls.certificate=${KBN_CERT_PATH}`, `--xpack.dataUsage.autoops.api.tls.key=${KBN_KEY_PATH}`, ], + enableFleetDockerRegistry: true, }); diff --git a/x-pack/solutions/observability/test/serverless/functional/configs/config.ts b/x-pack/solutions/observability/test/serverless/functional/configs/config.ts index 33ee38c33544f..4447f5571257b 100644 --- a/x-pack/solutions/observability/test/serverless/functional/configs/config.ts +++ b/x-pack/solutions/observability/test/serverless/functional/configs/config.ts @@ -22,4 +22,5 @@ export default createTestConfig({ // include settings from project controller esServerArgs: [], kbnServerArgs: [], + enableFleetDockerRegistry: true, }); From b859477f8affb9c09d8b07988ee51884fa8a481a Mon Sep 17 00:00:00 2001 From: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Date: Wed, 28 Jan 2026 10:32:27 +0000 Subject: [PATCH 2/8] Changes from node scripts/eslint_all_files --no-cache --fix --- .../test/serverless/api_integration/config.base.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/x-pack/platform/test/serverless/api_integration/config.base.ts b/x-pack/platform/test/serverless/api_integration/config.base.ts index 187542d5886f4..eefa52bc35f1a 100644 --- a/x-pack/platform/test/serverless/api_integration/config.base.ts +++ b/x-pack/platform/test/serverless/api_integration/config.base.ts @@ -45,11 +45,11 @@ export function createTestConfig(options: CreateTestConfigOptions) { ...(options.kbnServerArgs || []), ...(options.esServerlessOptions?.uiam ? [ - '--mockIdpPlugin.uiam.enabled=true', - `--xpack.security.uiam.enabled=true`, - `--xpack.security.uiam.url=${MOCK_IDP_UIAM_SERVICE_URL}`, - `--xpack.security.uiam.sharedSecret=${MOCK_IDP_UIAM_SHARED_SECRET}`, - ] + '--mockIdpPlugin.uiam.enabled=true', + `--xpack.security.uiam.enabled=true`, + `--xpack.security.uiam.url=${MOCK_IDP_UIAM_SERVICE_URL}`, + `--xpack.security.uiam.sharedSecret=${MOCK_IDP_UIAM_SHARED_SECRET}`, + ] : []), ...(enableFleetDockerRegistry && dockerRegistryPort ? [`--xpack.fleet.registryUrl=http://localhost:${dockerRegistryPort}`] From 60e7b12c9b225be0ffbae12c51e4c424f49db3dd Mon Sep 17 00:00:00 2001 From: mohamedhamed-ahmed Date: Wed, 28 Jan 2026 13:23:22 +0100 Subject: [PATCH 3/8] bug fix --- .../serverless/api_integration/configs/security/config.group1.ts | 1 + x-pack/platform/test/serverless/functional/config.oblt.base.ts | 1 - .../test/serverless/api_integration/configs/config.ts | 1 - .../observability/test/serverless/functional/configs/config.ts | 1 - .../configs/config.cloud_security_posture.agentless.ts | 1 + .../functional/configs/config.cloud_security_posture.basic.ts | 1 + .../functional/configs/config.cloud_security_posture.cloud.ts | 1 + .../configs/config.cloud_security_posture.essentials.ts | 1 + 8 files changed, 5 insertions(+), 3 deletions(-) diff --git a/x-pack/platform/test/serverless/api_integration/configs/security/config.group1.ts b/x-pack/platform/test/serverless/api_integration/configs/security/config.group1.ts index 5dafb8ab301ce..7a6b146e51e31 100644 --- a/x-pack/platform/test/serverless/api_integration/configs/security/config.group1.ts +++ b/x-pack/platform/test/serverless/api_integration/configs/security/config.group1.ts @@ -58,4 +58,5 @@ export default createTestConfig({ // Enables /internal/cloud_security_posture/graph API `--uiSettings.overrides.securitySolution:enableGraphVisualization=true`, ], + enableFleetDockerRegistry: false, }); diff --git a/x-pack/platform/test/serverless/functional/config.oblt.base.ts b/x-pack/platform/test/serverless/functional/config.oblt.base.ts index 2a107858eefb4..9fad49de27140 100644 --- a/x-pack/platform/test/serverless/functional/config.oblt.base.ts +++ b/x-pack/platform/test/serverless/functional/config.oblt.base.ts @@ -26,5 +26,4 @@ export default createTestConfig({ `--xpack.dataUsage.autoops.api.tls.certificate=${KBN_CERT_PATH}`, `--xpack.dataUsage.autoops.api.tls.key=${KBN_KEY_PATH}`, ], - enableFleetDockerRegistry: true, }); diff --git a/x-pack/solutions/observability/test/serverless/api_integration/configs/config.ts b/x-pack/solutions/observability/test/serverless/api_integration/configs/config.ts index d64bb5f2fc1a0..adbace3921aea 100644 --- a/x-pack/solutions/observability/test/serverless/api_integration/configs/config.ts +++ b/x-pack/solutions/observability/test/serverless/api_integration/configs/config.ts @@ -32,5 +32,4 @@ export default createTestConfig({ `--xpack.dataUsage.autoops.api.tls.certificate=${KBN_CERT_PATH}`, `--xpack.dataUsage.autoops.api.tls.key=${KBN_KEY_PATH}`, ], - enableFleetDockerRegistry: true, }); diff --git a/x-pack/solutions/observability/test/serverless/functional/configs/config.ts b/x-pack/solutions/observability/test/serverless/functional/configs/config.ts index 4447f5571257b..33ee38c33544f 100644 --- a/x-pack/solutions/observability/test/serverless/functional/configs/config.ts +++ b/x-pack/solutions/observability/test/serverless/functional/configs/config.ts @@ -22,5 +22,4 @@ export default createTestConfig({ // include settings from project controller esServerArgs: [], kbnServerArgs: [], - enableFleetDockerRegistry: true, }); diff --git a/x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.agentless.ts b/x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.agentless.ts index f6e940fed2f56..24ffe450f508c 100644 --- a/x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.agentless.ts +++ b/x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.agentless.ts @@ -42,4 +42,5 @@ export default createTestConfig({ ], // load tests in the index file testFiles: [require.resolve('../test_suites/ftr/cloud_security_posture/agentless')], + enableFleetDockerRegistry: false, }); diff --git a/x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.basic.ts b/x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.basic.ts index 28311f34b084a..f69156d33df47 100644 --- a/x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.basic.ts +++ b/x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.basic.ts @@ -27,4 +27,5 @@ export default createTestConfig({ ], // load tests in the index file testFiles: [require.resolve('../test_suites/ftr/cloud_security_posture')], + enableFleetDockerRegistry: false, }); diff --git a/x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.cloud.ts b/x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.cloud.ts index ea9d1942c028e..65d99f0098167 100644 --- a/x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.cloud.ts +++ b/x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.cloud.ts @@ -19,4 +19,5 @@ export default createTestConfig({ // load tests in the index file testFiles: [require.resolve('../test_suites/ftr/cloud_security_posture/cloud_tests')], + enableFleetDockerRegistry: false, }); diff --git a/x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.essentials.ts b/x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.essentials.ts index 0f6eda1c54d34..b5e82fa08fa81 100644 --- a/x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.essentials.ts +++ b/x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.essentials.ts @@ -32,4 +32,5 @@ export default createTestConfig({ '../test_suites/ftr/cloud_security_posture/csp_integrations_form.essentials.ts' ), ], + enableFleetDockerRegistry: false, }); From 2abb34c23d50a1265e286ee7f5b070b97e784b33 Mon Sep 17 00:00:00 2001 From: mohamedhamed-ahmed Date: Wed, 28 Jan 2026 15:53:24 +0100 Subject: [PATCH 4/8] skip security tests using dockerized image --- .../security/test/serverless/api_integration/configs/config.ts | 1 + .../functional/configs/config.cloud_security_posture.complete.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/x-pack/solutions/security/test/serverless/api_integration/configs/config.ts b/x-pack/solutions/security/test/serverless/api_integration/configs/config.ts index fe279b0da3d29..74fdeebc1f14a 100644 --- a/x-pack/solutions/security/test/serverless/api_integration/configs/config.ts +++ b/x-pack/solutions/security/test/serverless/api_integration/configs/config.ts @@ -36,4 +36,5 @@ export default createTestConfig({ // Enables /internal/cloud_security_posture/graph API `--uiSettings.overrides.securitySolution:enableGraphVisualization=true`, ], + enableFleetDockerRegistry: false, }); diff --git a/x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.complete.ts b/x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.complete.ts index 63d1a87aaa950..8ebfbac859ddd 100644 --- a/x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.complete.ts +++ b/x-pack/solutions/security/test/serverless/functional/configs/config.cloud_security_posture.complete.ts @@ -34,4 +34,5 @@ export default createTestConfig({ require.resolve('../test_suites/ftr/cloud_security_posture/graph_alerts_flyout'), require.resolve('../test_suites/ftr/cloud_security_posture/graph_events_flyout'), ], + enableFleetDockerRegistry: false, }); From 7fa1048cf1e7096f678adabedd0e225c2006d679 Mon Sep 17 00:00:00 2001 From: mohamedhamed-ahmed Date: Wed, 28 Jan 2026 20:29:36 +0100 Subject: [PATCH 5/8] isolate onboarding tests to prevent dockerized registry usage --- .buildkite/ftr_oblt_serverless_configs.yml | 1 + .../functional/configs/config.onboarding.ts | 26 +++++++++++++++++++ .../functional/configs/index.onboarding.ts | 16 ++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 x-pack/solutions/observability/test/serverless/functional/configs/config.onboarding.ts create mode 100644 x-pack/solutions/observability/test/serverless/functional/configs/index.onboarding.ts diff --git a/.buildkite/ftr_oblt_serverless_configs.yml b/.buildkite/ftr_oblt_serverless_configs.yml index 37d3981981e02..421f2fe461be3 100644 --- a/.buildkite/ftr_oblt_serverless_configs.yml +++ b/.buildkite/ftr_oblt_serverless_configs.yml @@ -20,6 +20,7 @@ enabled: - x-pack/solutions/observability/test/serverless/functional/configs/config.cases_and_rules.ts - x-pack/solutions/observability/test/serverless/functional/configs/config.ml_and_discover.ts - x-pack/solutions/observability/test/serverless/functional/configs/config.logs_essentials.ts + - x-pack/solutions/observability/test/serverless/functional/configs/config.onboarding.ts - x-pack/platform/test/serverless/functional/configs/observability/config.examples.ts - x-pack/solutions/observability/test/serverless/functional/configs/config.feature_flags.ts - x-pack/platform/test/serverless/functional/configs/observability/config.saved_objects_management.ts diff --git a/x-pack/solutions/observability/test/serverless/functional/configs/config.onboarding.ts b/x-pack/solutions/observability/test/serverless/functional/configs/config.onboarding.ts new file mode 100644 index 0000000000000..94d1cc8c04b4d --- /dev/null +++ b/x-pack/solutions/observability/test/serverless/functional/configs/config.onboarding.ts @@ -0,0 +1,26 @@ +/* + * 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 { createTestConfig } from '@kbn/test-suites-xpack-platform/serverless/functional/config.base'; +import { pageObjects } from '../page_objects'; +import { services } from '../services'; + +export default createTestConfig({ + serverlessProject: 'oblt', + services, + pageObjects, + testFiles: [require.resolve('./index.onboarding.ts')], + junit: { + reportName: 'Serverless Observability Onboarding Functional Tests', + }, + suiteTags: { exclude: ['skipSvlOblt'] }, + + // include settings from project controller + esServerArgs: [], + kbnServerArgs: [], + enableFleetDockerRegistry: false, +}); diff --git a/x-pack/solutions/observability/test/serverless/functional/configs/index.onboarding.ts b/x-pack/solutions/observability/test/serverless/functional/configs/index.onboarding.ts new file mode 100644 index 0000000000000..ea7f81088b31c --- /dev/null +++ b/x-pack/solutions/observability/test/serverless/functional/configs/index.onboarding.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 type { FtrProviderContext } from '../ftr_provider_context'; + +export default function ({ loadTestFile }: FtrProviderContext) { + describe('serverless observability onboarding', function () { + this.tags(['esGate']); + + loadTestFile(require.resolve('../test_suites/onboarding')); + }); +} From c5ba26a7fc81af865fb5b42f1a88e942acf55aa7 Mon Sep 17 00:00:00 2001 From: mohamedhamed-ahmed Date: Wed, 28 Jan 2026 22:43:22 +0100 Subject: [PATCH 6/8] fix config --- .../test/serverless/functional/configs/index.onboarding.ts | 2 +- .../observability/test/serverless/functional/configs/index.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/x-pack/solutions/observability/test/serverless/functional/configs/index.onboarding.ts b/x-pack/solutions/observability/test/serverless/functional/configs/index.onboarding.ts index ea7f81088b31c..25ae7cc9c9782 100644 --- a/x-pack/solutions/observability/test/serverless/functional/configs/index.onboarding.ts +++ b/x-pack/solutions/observability/test/serverless/functional/configs/index.onboarding.ts @@ -8,7 +8,7 @@ import type { FtrProviderContext } from '../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { - describe('serverless observability onboarding', function () { + describe('serverless observability UI - onboarding', function () { this.tags(['esGate']); loadTestFile(require.resolve('../test_suites/onboarding')); diff --git a/x-pack/solutions/observability/test/serverless/functional/configs/index.ts b/x-pack/solutions/observability/test/serverless/functional/configs/index.ts index d2c43c6e086ee..b4b3b994e8688 100644 --- a/x-pack/solutions/observability/test/serverless/functional/configs/index.ts +++ b/x-pack/solutions/observability/test/serverless/functional/configs/index.ts @@ -13,7 +13,6 @@ export default function ({ loadTestFile }: FtrProviderContext) { loadTestFile(require.resolve('../test_suites/navigation')); loadTestFile(require.resolve('../test_suites/dataset_quality')); - loadTestFile(require.resolve('../test_suites/onboarding')); loadTestFile(require.resolve('../test_suites/role_management')); loadTestFile(require.resolve('../test_suites/advanced_settings')); loadTestFile(require.resolve('../test_suites/privileges')); From 62bfddad1f46f5ca6bc368743f78eaaf454f38eb Mon Sep 17 00:00:00 2001 From: mohamedhamed-ahmed Date: Thu, 29 Jan 2026 12:15:21 +0100 Subject: [PATCH 7/8] bug fix --- .../test/serverless/api_integration/config.base.ts | 10 +++++++++- .../platform/test/serverless/functional/config.base.ts | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/x-pack/platform/test/serverless/api_integration/config.base.ts b/x-pack/platform/test/serverless/api_integration/config.base.ts index eefa52bc35f1a..cbd9337c6ddd3 100644 --- a/x-pack/platform/test/serverless/api_integration/config.base.ts +++ b/x-pack/platform/test/serverless/api_integration/config.base.ts @@ -24,7 +24,15 @@ export function createTestConfig(options: CreateTestConfigOptions) { ...services, ...options.services, }, - ...(!enableFleetDockerRegistry && { dockerServers: undefined }), + dockerServers: enableFleetDockerRegistry + ? svlSharedConfig.get('dockerServers') + : { + ...svlSharedConfig.get('dockerServers'), + registry: { + ...svlSharedConfig.get('dockerServers.registry'), + enabled: false, + }, + }, esTestCluster: { ...svlSharedConfig.get('esTestCluster'), serverArgs: [ diff --git a/x-pack/platform/test/serverless/functional/config.base.ts b/x-pack/platform/test/serverless/functional/config.base.ts index 8cdef524250cb..1f23f8b456c48 100644 --- a/x-pack/platform/test/serverless/functional/config.base.ts +++ b/x-pack/platform/test/serverless/functional/config.base.ts @@ -27,7 +27,15 @@ export function createTestConfig< testConfigCategory: ScoutTestRunConfigCategory.UI_TEST, pageObjects: { ...pageObjects, ...options.pageObjects }, services: { ...services, ...options.services }, - ...(!enableFleetDockerRegistry && { dockerServers: undefined }), + dockerServers: enableFleetDockerRegistry + ? svlSharedConfig.get('dockerServers') + : { + ...svlSharedConfig.get('dockerServers'), + registry: { + ...svlSharedConfig.get('dockerServers.registry'), + enabled: false, + }, + }, esTestCluster: { ...svlSharedConfig.get('esTestCluster'), serverArgs: [ From b2d888947e536e5a70a591ff28bea09fdee89376 Mon Sep 17 00:00:00 2001 From: mohamedhamed-ahmed Date: Thu, 29 Jan 2026 16:02:36 +0100 Subject: [PATCH 8/8] bug fix --- .../serverless/api_integration/config.base.ts | 14 +++++--------- .../test/serverless/functional/config.base.ts | 15 +++++---------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/x-pack/platform/test/serverless/api_integration/config.base.ts b/x-pack/platform/test/serverless/api_integration/config.base.ts index cbd9337c6ddd3..9573bb651bf13 100644 --- a/x-pack/platform/test/serverless/api_integration/config.base.ts +++ b/x-pack/platform/test/serverless/api_integration/config.base.ts @@ -15,6 +15,7 @@ export function createTestConfig(options: CreateTestConfigOptions) { return async ({ readConfigFile }: FtrConfigProviderContext) => { const svlSharedConfig = await readConfigFile(require.resolve('../shared/config.base.ts')); const enableFleetDockerRegistry = options.enableFleetDockerRegistry ?? true; + const dockerServers = svlSharedConfig.get('dockerServers'); return { ...svlSharedConfig.getAll(), @@ -24,15 +25,10 @@ export function createTestConfig(options: CreateTestConfigOptions) { ...services, ...options.services, }, - dockerServers: enableFleetDockerRegistry - ? svlSharedConfig.get('dockerServers') - : { - ...svlSharedConfig.get('dockerServers'), - registry: { - ...svlSharedConfig.get('dockerServers.registry'), - enabled: false, - }, - }, + dockerServers: + !enableFleetDockerRegistry && dockerServers?.registry + ? { ...dockerServers, registry: { ...dockerServers.registry, enabled: false } } + : dockerServers, esTestCluster: { ...svlSharedConfig.get('esTestCluster'), serverArgs: [ diff --git a/x-pack/platform/test/serverless/functional/config.base.ts b/x-pack/platform/test/serverless/functional/config.base.ts index 1f23f8b456c48..e11f8061bda22 100644 --- a/x-pack/platform/test/serverless/functional/config.base.ts +++ b/x-pack/platform/test/serverless/functional/config.base.ts @@ -20,22 +20,17 @@ export function createTestConfig< const svlSharedConfig = await readConfigFile(require.resolve('../shared/config.base.ts')); const enableFleetDockerRegistry = options.enableFleetDockerRegistry ?? true; + const dockerServers = svlSharedConfig.get('dockerServers'); return { ...svlSharedConfig.getAll(), - + dockerServers: + !enableFleetDockerRegistry && dockerServers?.registry + ? { ...dockerServers, registry: { ...dockerServers.registry, enabled: false } } + : dockerServers, testConfigCategory: ScoutTestRunConfigCategory.UI_TEST, pageObjects: { ...pageObjects, ...options.pageObjects }, services: { ...services, ...options.services }, - dockerServers: enableFleetDockerRegistry - ? svlSharedConfig.get('dockerServers') - : { - ...svlSharedConfig.get('dockerServers'), - registry: { - ...svlSharedConfig.get('dockerServers.registry'), - enabled: false, - }, - }, esTestCluster: { ...svlSharedConfig.get('esTestCluster'), serverArgs: [