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 @@ -45,6 +45,7 @@ enabled:
- x-pack/platform/test/serverless/functional/configs/observability/config.group17.ts
- x-pack/platform/test/serverless/functional/configs/observability/config.group18.ts
- x-pack/platform/test/serverless/functional/configs/observability/config.group19.ts
- x-pack/platform/test/serverless/functional/configs/observability/config.feature_flags.ts
- x-pack/platform/test/serverless/functional/configs/observability/config.logs_essentials.group1.ts
- x-pack/solutions/observability/test/serverless/functional/configs/config.screenshots.ts
- x-pack/solutions/observability/test/serverless/functional/configs/config.telemetry.ts
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/ftr_search_serverless_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ enabled:
- x-pack/platform/test/serverless/functional/configs/search/config.group18.ts
- x-pack/platform/test/serverless/functional/configs/search/config.group19.ts
- x-pack/platform/test/serverless/functional/configs/search/config.group20.ts
- x-pack/platform/test/serverless/functional/configs/search/config.group21.ts
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably it was removed accidentally?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was only one test here, so I moved it into the feature flag tests. config.group21.ts was renamed to config.feature_flags.ts

- x-pack/platform/test/serverless/functional/configs/search/config.feature_flags.ts
- x-pack/platform/test/agent_builder_api_integration/configs/config.serverless.ts
1 change: 1 addition & 0 deletions .buildkite/ftr_security_serverless_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ enabled:
- x-pack/platform/test/serverless/functional/configs/security/config.group17.ts
- x-pack/platform/test/serverless/functional/configs/security/config.group18.ts
- x-pack/platform/test/serverless/functional/configs/security/config.group19.ts
- x-pack/platform/test/serverless/functional/configs/security/config.feature_flags.ts
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/configs/serverless.config.ts
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/trial_license_complete_tier/configs/serverless.config.ts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ export const buildServices = ({
discoverShared: plugins.discoverShared,
discoverFeatureFlags: {
getCascadeLayoutEnabled: () =>
core.featureFlags.getBooleanValue(CASCADE_LAYOUT_ENABLED_FEATURE_FLAG_KEY, false),
core.featureFlags.getBooleanValue(CASCADE_LAYOUT_ENABLED_FEATURE_FLAG_KEY, true),
getIsEsqlDefault: () =>
core.featureFlags.getBooleanValue(IS_ESQL_DEFAULT_FEATURE_FLAG_KEY, false),
getEmbeddableTransformsEnabled: () =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import type { FtrConfigProviderContext } from '@kbn/test';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(require.resolve('../../../config.base.js'));
const kbnTestServer = functionalConfig.get('kbnTestServer');
const esTestCluster = functionalConfig.get('esTestCluster');

return {
Expand All @@ -20,13 +19,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
...esTestCluster,
license: 'trial', // required to test categorize grouping
},
kbnTestServer: {
...kbnTestServer,
serverArgs: [
...kbnTestServer.serverArgs,
'--feature_flags.overrides.discover.cascadeLayoutEnabled=true',
],
},
testFiles: [require.resolve('.')],
};
}
7 changes: 7 additions & 0 deletions src/platform/test/functional/apps/discover/esql_2/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,12 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
...functionalConfig.esTestCluster,
serverArgs: ['xpack.security.enabled=true'],
},
kbnTestServer: {
...functionalConfig.kbnTestServer,
serverArgs: [
...functionalConfig.kbnTestServer.serverArgs,
'--feature_flags.overrides.discover.cascadeLayoutEnabled=false',
],
},
};
}
8 changes: 8 additions & 0 deletions src/platform/test/functional/apps/discover/group9/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,17 @@ import type { FtrConfigProviderContext } from '@kbn/test';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(require.resolve('../../../config.base.js'));
const kbnTestServer = functionalConfig.get('kbnTestServer');

return {
...functionalConfig.getAll(),
kbnTestServer: {
...kbnTestServer,
serverArgs: [
...kbnTestServer.serverArgs,
'--feature_flags.overrides.discover.cascadeLayoutEnabled=false',
],
},
testFiles: [require.resolve('.')],
};
}
8 changes: 8 additions & 0 deletions x-pack/platform/test/functional/apps/aiops/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,18 @@ import type { FtrConfigProviderContext } from '@kbn/test';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(require.resolve('../../config.base.ts'));
const kbnTestServer = functionalConfig.get('kbnTestServer');

return {
...functionalConfig.getAll(),
testFiles: [require.resolve('.')],
kbnTestServer: {
...kbnTestServer,
serverArgs: [
...kbnTestServer.serverArgs,
'--feature_flags.overrides.discover.cascadeLayoutEnabled=false',
],
},
junit: {
reportName: 'Chrome X-Pack UI Functional Tests - aiops',
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,17 @@ import type { FtrConfigProviderContext } from '@kbn/test';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(require.resolve('../../../config.base.ts'));
const kbnTestServer = functionalConfig.get('kbnTestServer');

return {
...functionalConfig.getAll(),
kbnTestServer: {
...kbnTestServer,
serverArgs: [
...kbnTestServer.serverArgs,
'--feature_flags.overrides.discover.cascadeLayoutEnabled=false',
],
},
testFiles: [require.resolve('.')],
};
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*
* 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 { FtrConfigProviderContext } from '@kbn/test';

/**
* Make sure to create a MKI deployment with custom Kibana image, that includes feature flags arguments.
* These tests most likely will fail on default MKI project.
*/
export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const baseTestConfig = await readConfigFile(require.resolve('../../config.oblt.base.ts'));
const kbnTestServer = baseTestConfig.get('kbnTestServer');

return {
...baseTestConfig.getAll(),
kbnTestServer: {
...kbnTestServer,
serverArgs: [
...kbnTestServer.serverArgs,
'--feature_flags.overrides.discover.cascadeLayoutEnabled=false',
],
},
testFiles: [require.resolve('../../test_suites/discover/esql')],
junit: {
reportName: 'Serverless Observability Feature Flags Functional Tests',
},
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {

return {
...baseTestConfig.getAll(),
testFiles: [
require.resolve('../../test_suites/context'),
require.resolve('../../test_suites/discover/esql'),
],
testFiles: [require.resolve('../../test_suites/context')],
junit: {
reportName: 'Serverless Observability Functional Tests - Common Group 6',
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,26 @@

import type { FtrConfigProviderContext } from '@kbn/test';

/**
* Make sure to create a MKI deployment with custom Kibana image, that includes feature flags arguments.
* These tests most likely will fail on default MKI project.
*/
export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const baseTestConfig = await readConfigFile(require.resolve('../../config.search.base.ts'));
const kbnTestServer = baseTestConfig.get('kbnTestServer');

return {
...baseTestConfig.getAll(),
kbnTestServer: {
...kbnTestServer,
serverArgs: [
...kbnTestServer.serverArgs,
'--feature_flags.overrides.discover.cascadeLayoutEnabled=false',
],
},
testFiles: [require.resolve('../../test_suites/discover/esql')],
junit: {
reportName: 'Serverless Search Functional Tests - Common Group 21',
reportName: 'Serverless Search Feature Flags Functional Tests',
},
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {

return {
...baseTestConfig.getAll(),
testFiles: [
require.resolve('../../test_suites/context'),
require.resolve('../../test_suites/discover/esql'),
],
testFiles: [require.resolve('../../test_suites/context')],
junit: {
reportName: 'Serverless Search Functional Tests - Common Group 10',
},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*
* 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 { FtrConfigProviderContext } from '@kbn/test';

/**
* Make sure to create a MKI deployment with custom Kibana image, that includes feature flags arguments.
* These tests most likely will fail on default MKI project.
*/
export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const baseTestConfig = await readConfigFile(require.resolve('../../config.security.base.ts'));
const kbnTestServer = baseTestConfig.get('kbnTestServer');

return {
...baseTestConfig.getAll(),
kbnTestServer: {
...kbnTestServer,
serverArgs: [
...kbnTestServer.serverArgs,
'--feature_flags.overrides.discover.cascadeLayoutEnabled=false',
],
},
testFiles: [require.resolve('../../test_suites/discover/esql')], // 7 min
junit: {
reportName: 'Serverless Security Feature Flags Functional Tests',
},
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {

return {
...baseTestConfig.getAll(),
testFiles: [
require.resolve('../../test_suites/context'), // 5 min
require.resolve('../../test_suites/discover/esql'), // 7 min
],
testFiles: [require.resolve('../../test_suites/context')], // 5 min
junit: {
reportName: 'Serverless Security Functional Tests - Common Group 10',
},
Expand Down
Loading