Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
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
Expand Up @@ -9,13 +9,21 @@ import type { FtrConfigProviderContext } from '@kbn/test';

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

return {
...baseTestConfig.getAll(),
testFiles: [
require.resolve('../../test_suites/context'),
require.resolve('../../test_suites/discover/esql'),
],
kbnTestServer: {
...kbnTestServer,
serverArgs: [
...kbnTestServer.serverArgs,
'--feature_flags.overrides.discover.cascadeLayoutEnabled=false',
],
},
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.

The tests in this config are run against MKI and this override won't be respected by Project deployment probably causing the tests to fail and blocking release pipeline:

  • if feature flag is required by some tests, you need to create FTR feature flag config and move loading them from this config to the feature flag one. The new config won't be run on MKI, but only on Kibana CI
  • as soon as flag is enabled on MKI, you can move the tests back under the default config

junit: {
reportName: 'Serverless Observability Functional Tests - Common Group 6',
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,21 @@ import type { FtrConfigProviderContext } from '@kbn/test';

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

return {
...baseTestConfig.getAll(),
testFiles: [
require.resolve('../../test_suites/context'),
require.resolve('../../test_suites/discover/esql'),
],
kbnTestServer: {
...kbnTestServer,
serverArgs: [
...kbnTestServer.serverArgs,
'--feature_flags.overrides.discover.cascadeLayoutEnabled=false',
],
},
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.

Same issue here, we can't override default configs under x-pack/platform/test/serverless/functional/configs/

junit: {
reportName: 'Serverless Search Functional Tests - Common Group 10',
},
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 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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,21 @@ import type { FtrConfigProviderContext } from '@kbn/test';

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

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