Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
bug fix
  • Loading branch information
mohamedhamed-ahmed committed Jan 29, 2026
commit b2d888947e536e5a70a591ff28bea09fdee89376
14 changes: 5 additions & 9 deletions x-pack/platform/test/serverless/api_integration/config.base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand All @@ -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: [
Expand Down
15 changes: 5 additions & 10 deletions x-pack/platform/test/serverless/functional/config.base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand Down
Loading