Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
1 change: 1 addition & 0 deletions .buildkite/ftr_oblt_serverless_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ disabled:
- x-pack/solutions/observability/test/serverless/api_integration/configs/config.ts
- x-pack/solutions/observability/test/serverless/api_integration/configs/configs.logs_essentials.ts
- x-pack/solutions/observability/test/serverless/api_integration/test_suites/fleet/config.ts
- x-pack/solutions/observability/test/serverless/functional/configs/config.onboarding.ts
- x-pack/solutions/observability/test/serverless/functional/configs/config.feature_flags.ts
- x-pack/solutions/observability/test/serverless/functional/configs/config.log_essentials.ts
- x-pack/solutions/observability/test/serverless/functional/configs/config.screenshots.ts
Expand Down
11 changes: 10 additions & 1 deletion x-pack/platform/test/serverless/api_integration/config.base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
import { FtrConfigProviderContext } from '@kbn/test';
import { dockerRegistryPort, type FtrConfigProviderContext } from '@kbn/test';
import { ScoutTestRunConfigCategory } from '@kbn/scout-info';

import { services } from './services';
Expand All @@ -13,6 +13,8 @@ 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;
const dockerServers = svlSharedConfig.get('dockerServers');

return {
...svlSharedConfig.getAll(),
Expand All @@ -22,6 +24,10 @@ export function createTestConfig(options: CreateTestConfigOptions) {
...services,
...options.services,
},
dockerServers:
!enableFleetDockerRegistry && dockerServers?.registry
? { ...dockerServers, registry: { ...dockerServers.registry, enabled: false } }
: dockerServers,
esTestCluster: {
...svlSharedConfig.get('esTestCluster'),
serverArgs: [
Expand All @@ -36,6 +42,9 @@ export function createTestConfig(options: CreateTestConfigOptions) {
...svlSharedConfig.get('kbnTestServer.serverArgs'),
`--serverless=${options.serverlessProject}`,
...(options.kbnServerArgs || []),
...(enableFleetDockerRegistry && dockerRegistryPort
? [`--xpack.fleet.registryUrl=http://localhost:${dockerRegistryPort}`]
: []),
],
},
testFiles: options.testFiles,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,5 @@ export default createTestConfig({
// Enables /internal/cloud_security_posture/graph API
`--uiSettings.overrides.securitySolution:enableGraphVisualization=true`,
],
enableFleetDockerRegistry: false,
});
13 changes: 11 additions & 2 deletions x-pack/platform/test/serverless/functional/config.base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import { 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';
Expand All @@ -18,9 +18,15 @@ export function createTestConfig<TServices extends {} = typeof services>(
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(),

dockerServers:
!enableFleetDockerRegistry && dockerServers?.registry
? { ...dockerServers, registry: { ...dockerServers.registry, enabled: false } }
: dockerServers,
testConfigCategory: ScoutTestRunConfigCategory.UI_TEST,
pageObjects,
services: { ...services, ...options.services },
Expand All @@ -45,6 +51,9 @@ export function createTestConfig<TServices extends {} = typeof services>(
? ['--xpack.security.roleManagementEnabled=true']
: []),
...(options.kbnServerArgs ?? []),
...(enableFleetDockerRegistry && dockerRegistryPort
? [`--xpack.fleet.registryUrl=http://localhost:${dockerRegistryPort}`]
: []),
],
},
testFiles: options.testFiles,
Expand Down
1 change: 1 addition & 0 deletions x-pack/platform/test/serverless/shared/types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ export interface CreateTestConfigOptions<
services?: TServices;
pageObjects?: TPageObjects;
apps?: Record<string, { pathname: string; hash?: string }>;
enableFleetDockerRegistry?: boolean;
}
Original file line number Diff line number Diff line change
@@ -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,
});
Original file line number Diff line number Diff line change
@@ -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 UI - onboarding', function () {
this.tags(['esGate']);

loadTestFile(require.resolve('../test_suites/onboarding'));
});
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ export default function ({ loadTestFile }: FtrProviderContext) {
loadTestFile(require.resolve('../test_suites/discover/context_awareness'));
loadTestFile(require.resolve('../test_suites/discover/logs'));
loadTestFile(require.resolve('../test_suites/discover/embeddables'));
loadTestFile(require.resolve('../test_suites/onboarding'));
loadTestFile(require.resolve('../test_suites/rules/rules_list'));
loadTestFile(require.resolve('../test_suites/rules/custom_threshold_consumer'));
loadTestFile(require.resolve('../test_suites/rules/es_query_consumer'));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,5 @@ export default createTestConfig({
`--uiSettings.overrides.securitySolution:enableGraphVisualization=true`,
`--xpack.securitySolutionServerless.usageApi.url=http://localhost:8081`,
],
enableFleetDockerRegistry: false,
});
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ export default createTestConfig({
],
// load tests in the index file
testFiles: [require.resolve('../test_suites/ftr/cloud_security_posture')],
enableFleetDockerRegistry: false,
});
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ export default createTestConfig({
'../test_suites/ftr/cloud_security_posture/csp_integrations_form.essentials.ts'
),
],
enableFleetDockerRegistry: false,
});