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
3 changes: 0 additions & 3 deletions .buildkite/ftr_base_serverless_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ disabled:
- x-pack/platform/test/api_integration_deployment_agnostic/default_configs/serverless.config.base.ts
- x-pack/platform/test/api_integration_deployment_agnostic/default_configs/feature_flag.serverless.config.base.ts
# Serverless base config files
- x-pack/test_serverless/api_integration/config.base.ts
- x-pack/test_serverless/functional/config.base.ts
- x-pack/test_serverless/shared/config.base.ts
- x-pack/platform/test/serverless/shared/config.base.ts
- x-pack/platform/test/serverless/api_integration/config.base.ts
- x-pack/platform/test/serverless/functional/config.base.ts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ steps:
env:
FTR_CONFIGS_SCRIPT: 'TEST_ES_SERVERLESS_IMAGE=$ES_SERVERLESS_IMAGE .buildkite/scripts/steps/test/ftr_configs.sh'
JEST_INTEGRATION_SCRIPT: 'TEST_ES_SERVERLESS_IMAGE=$ES_SERVERLESS_IMAGE .buildkite/scripts/steps/test/jest_integration.sh'
FTR_CONFIG_PATTERNS: '**/test_serverless/**,**/test/security_solution_api_integration/**/serverless.config.ts,x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/**,x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/**'
FTR_CONFIG_PATTERNS: '**/test/serverless/**,**/test/security_solution_api_integration/**/serverless.config.ts,x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/**,x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/**'
FTR_EXTRA_ARGS: '$FTR_EXTRA_ARGS'
LIMIT_CONFIG_TYPE: 'functional,integration'
retry:
Expand Down
3 changes: 0 additions & 3 deletions .buildkite/pull_requests.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
"^x-pack/platform/test/",
"^x-pack/solutions/(search|observability|security)/test/",
"^x-pack/test/",
"^x-pack/test_serverless/",
"/__snapshots__/",
"\\.test\\.(ts|tsx|js|jsx)"
]
Expand All @@ -70,7 +69,6 @@
"kibana_build_reuse_regexes": [
"^test/",
"^x-pack/test/",
"^x-pack/test_serverless/",
"^x-pack/platform/test/",
"^x-pack/solutions/(search|observability|security)/test/",
"/__snapshots__/",
Expand Down Expand Up @@ -98,7 +96,6 @@
"kibana_build_reuse_regexes": [
"^test/",
"^x-pack/test/",
"^x-pack/test_serverless/",
"^x-pack/platform/test/",
"^x-pack/solutions/(search|observability|security)/test/",
"/__snapshots__/",
Expand Down
10 changes: 4 additions & 6 deletions .buildkite/scripts/lifecycle/post_command.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,13 @@ if [[ "$IS_TEST_EXECUTION_STEP" == "true" ]]; then
buildkite-agent artifact upload 'x-pack/platform/test/**/screenshots/diff/*.png'
buildkite-agent artifact upload 'x-pack/platform/test/**/screenshots/failure/*.png'
buildkite-agent artifact upload 'x-pack/platform/test/**/screenshots/session/*.png'
buildkite-agent artifact upload 'x-pack/platform/test_serverless/**/screenshots/diff/*.png'
buildkite-agent artifact upload 'x-pack/platform/test_serverless/**/screenshots/failure/*.png'
buildkite-agent artifact upload 'x-pack/platform/test_serverless/**/screenshots/session/*.png'
buildkite-agent artifact upload 'x-pack/platform/test/serverless/**/screenshots/diff/*.png'
buildkite-agent artifact upload 'x-pack/platform/test/serverless/**/screenshots/failure/*.png'
buildkite-agent artifact upload 'x-pack/platform/test/serverless/**/screenshots/session/*.png'
buildkite-agent artifact upload 'x-pack/platform/test/serverless/**/failure_debug/html/*.html'
buildkite-agent artifact upload 'x-pack/test/**/screenshots/diff/*.png'
buildkite-agent artifact upload 'x-pack/test/**/screenshots/failure/*.png'
buildkite-agent artifact upload 'x-pack/test/**/screenshots/session/*.png'
buildkite-agent artifact upload 'x-pack/test_serverless/**/screenshots/failure/*.png'
buildkite-agent artifact upload 'x-pack/test_serverless/**/screenshots/session/*.png'
buildkite-agent artifact upload 'x-pack/test_serverless/**/failure_debug/html/*.html'
buildkite-agent artifact upload 'x-pack/test/functional/apps/reporting/reports/session/*.pdf'
buildkite-agent artifact upload 'x-pack/test/functional/failure_debug/html/*.html'
buildkite-agent artifact upload '.es/**/*.hprof'
Expand Down
6 changes: 1 addition & 5 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ const DEV_PATTERNS = [
...DEV_FILE_PATTERNS.map((file) => `{packages,src,x-pack}/**/${file}`),
'src/platform/packages/shared/kbn-interpreter/tasks/**/*',
'src/dev/**/*',
'x-pack/{dev-tools,tasks,test,test_serverless,build_chromium}/**/*',
'x-pack/{dev-tools,tasks,test,build_chromium}/**/*',
'x-pack/performance/**/*',
'src/setup_node_env/index.js',
'src/cli/dev.js',
Expand Down Expand Up @@ -791,12 +791,10 @@ module.exports = {
'x-pack/platform/test/upgrade_assistant_integration/**/*',
'x-pack/test/performance/**/*.ts',
'**/cypress.config.{js,ts}',
'x-pack/test_serverless/**/config*.ts',
'x-pack/platform/test/serverless/shared/config*.ts',
'x-pack/platform/test/serverless/*/test_suites/**/*',
'x-pack/platform/test/serverless/functional/config*.ts',
'x-pack/platform/test/serverless/*/configs/**/*',
'x-pack/test_serverless/*/test_suites/**/*',
'x-pack/test/profiling_api_integration/**/*.ts',
'x-pack/solutions/security/test/security_solution_api_integration/*/test_suites/**/*',
'x-pack/solutions/security/test/security_solution_api_integration/**/config*.ts',
Expand Down Expand Up @@ -1591,7 +1589,6 @@ module.exports = {
'src/platform/test/*api_integration*/**/*.{js,ts}',
'x-pack/test/{accessibility,*functional*}/apps/**/*.{js,ts}',
'x-pack/test/*api_integration*/**/*.{js,ts}',
'x-pack/test_serverless/{functional,api_integration}/test_suites/**/*.{js,ts}',
],
extends: ['plugin:mocha/recommended'],
plugins: ['mocha'],
Expand Down Expand Up @@ -2334,7 +2331,6 @@ module.exports = {

// For now, we keep the exception to let tests depend on anythying.
// Ideally, we need to classify the solution specific ones to reduce CI times
'x-pack/test_serverless/**',
'x-pack/test/**',
'x-pack/platform/test/plugin_functional/plugins/resolver_test/**',
],
Expand Down
29 changes: 2 additions & 27 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -1125,7 +1125,6 @@ x-pack/solutions/security/plugins/session_view @elastic/kibana-cloud-security-po
x-pack/solutions/security/test
x-pack/solutions/security/test/plugin_functional/plugins/resolver_test @elastic/security-solution
x-pack/test
x-pack/test_serverless
####
## Everything below this line overrides the default assignments for each package.
## Items lower in the file have higher precedence:
Expand Down Expand Up @@ -1409,7 +1408,6 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
/x-pack/test/functional/page_objects/infra_* @elastic/obs-ux-infra_services-team
/x-pack/solutions/observability/test/functional/page_objects/infra_* @elastic/obs-ux-infra_services-team
/x-pack/solutions/observability/test/fixtures/es_archives/infra @elastic/obs-ux-infra_services-team
/x-pack/test_serverless/**/test_suites/observability/infra/ @elastic/obs-ux-infra_services-team
/src/platform/test/common/plugins/otel_metrics @elastic/obs-ux-infra_services-team
/x-pack/solutions/observability/plugins/infra/common @elastic/obs-ux-infra_services-team
/x-pack/solutions/observability/plugins/infra/docs @elastic/obs-ux-infra_services-team
Expand Down Expand Up @@ -1439,8 +1437,6 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
## Logs UI code exceptions -> @elastic/obs-ux-logs-team
/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/data_quality/ @elastic/obs-ux-logs-team
/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/onboarding/ @elastic/obs-ux-logs-team
/x-pack/test_serverless/functional/page_objects/svl_oblt_onboarding_stream_log_file.ts @elastic/obs-ux-logs-team
/x-pack/test_serverless/functional/page_objects/svl_oblt_onboarding_page.ts @elastic/obs-ux-logs-team
/x-pack/solutions/observability/plugins/infra/common/http_api/log_alerts @elastic/obs-ux-logs-team
/x-pack/solutions/observability/plugins/infra/common/http_api/log_analysis @elastic/obs-ux-logs-team
/x-pack/solutions/observability/plugins/infra/common/log_analysis @elastic/obs-ux-logs-team
Expand Down Expand Up @@ -1492,8 +1488,6 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
/x-pack/solutions/observability/test/api_integration/apis/security/ @elastic/obs-ux-management-team
/x-pack/solutions/observability/plugins/infra/public/alerting @elastic/obs-ux-management-team
/x-pack/solutions/observability/plugins/infra/server/lib/alerting @elastic/obs-ux-management-team
/x-pack/test_serverless/**/test_suites/observability/custom_threshold_rule/ @elastic/obs-ux-management-team
/x-pack/test_serverless/**/test_suites/observability/slos/ @elastic/obs-ux-management-team
/x-pack/solutions/observability/test/serverless/api_integration/test_suites/es_query_rule @elastic/obs-ux-management-team
/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/alerting/ @elastic/obs-ux-management-team
/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/slo/ @elastic/obs-ux-management-team
Expand Down Expand Up @@ -1537,8 +1531,8 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
/x-pack/platform/test/fleet_multi_cluster @elastic/fleet
/src/dev/build/tasks/bundle_fleet_packages.ts @elastic/fleet @elastic/kibana-operations
/x-pack/platform/plugins/shared/fleet/server/services/elastic_agent_manifest.ts @elastic/fleet @elastic/obs-cloudnative-monitoring
/x-pack/test_serverless/**/test_suites/**/fleet/ @elastic/fleet
/x-pack/**/test/serverless/**/test_suites/fleet/ @elastic/fleet
/x-pack/solutions/**/test/serverless/**/test_suites/fleet/ @elastic/fleet
/x-pack/platform/test/serverless/**/test_suites/fleet/ @elastic/fleet
/x-pack/platform/test/serverless/api_integration/services/default_fleet_setup.ts @elastic/fleet

# APM
Expand Down Expand Up @@ -1612,7 +1606,6 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
/x-pack/solutions/observability/test/serverless/api_integration/configs/index.ts @elastic/observability-ui
/x-pack/solutions/observability/test/functional_solution_sidenav/ @elastic/observability-ui
/x-pack/solutions/observability/test/functional/page_objects/observability_page.ts @elastic/observability-ui
/x-pack/test_serverless/**/test_suites/observability/config.ts @elastic/observability-ui

# Observability onboarding tour
/x-pack/solutions/observability/plugins/observability_shared/public/components/tour @elastic/appex-sharedux
Expand Down Expand Up @@ -1703,7 +1696,6 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
/x-pack/platform/test/alerting_api_integration/spaces_only/tests/alerting/transform_rule_types/ @elastic/ml-ui @elastic/kibana-management
/x-pack/platform/test/screenshot_creation/apps/ml_docs @elastic/ml-ui
/x-pack/platform/test/screenshot_creation/services/ml_screenshots.ts @elastic/ml-ui
/x-pack/test_serverless/**/test_suites/**/ml/ @elastic/ml-ui
/x-pack/solutions/**/test/serverless/**/test_suites/ml/ @elastic/ml-ui

# Security Machine Learning
Expand Down Expand Up @@ -1882,17 +1874,12 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
/x-pack/test/accessibility/services.ts @elastic/appex-qa
/x-pack/test/accessibility/page_objects.ts @elastic/appex-qa
/x-pack/test/accessibility/ftr_provider_context.d.ts @elastic/appex-qa
/x-pack/test_serverless/tsconfig.json @elastic/appex-qa
/x-pack/test_serverless/kibana.jsonc @elastic/appex-qa
/x-pack/platform/test/serverless/functional/test_suites/README.md @elastic/appex-qa
/x-pack/test_serverless/functional/page_objects/index.ts @elastic/appex-qa
/x-pack/test_serverless/functional/ftr_provider_context.d.ts @elastic/appex-qa
/x-pack/platform/test/serverless/functional/test_suites/management/index.ts @elastic/appex-qa
/x-pack/platform/test/serverless/functional/test_suites/examples/index.ts @elastic/appex-qa
/x-pack/platform/test/serverless/functional/page_objects/svl_common_page.ts @elastic/appex-qa
/x-pack/platform/test/README.md @elastic/appex-qa
/x-pack/platform/test/serverless/README.md @elastic/appex-qa
/x-pack/test_serverless/api_integration/ftr_provider_context.d.ts @elastic/appex-qa
/x-pack/platform/test/serverless/api_integration/test_suites/README.md @elastic/appex-qa
/src/dev/code_coverage @elastic/appex-qa
/src/platform/test/functional/services/common @elastic/appex-qa
Expand All @@ -1901,13 +1888,9 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
/src/platform/test/visual_regression @elastic/appex-qa
/src/platform/packages/shared/kbn-test/src/functional_test_runner @elastic/appex-qa
/packages/kbn-performance-testing-dataset-extractor @elastic/appex-qa
/x-pack/test_serverless/**/*config.base.ts @elastic/appex-qa
/x-pack/test_serverless/**/deployment_agnostic_services.ts @elastic/appex-qa
/x-pack/test_serverless/shared/ @elastic/appex-qa
/x-pack/platform/test/serverless/api_integration/test_suites/elasticsearch_api @elastic/appex-qa
/x-pack/solutions/security/test/serverless/functional/test_suites/ftr/ @elastic/appex-qa
/x-pack/platform/test/serverless/functional/test_suites/home_page/ @elastic/appex-qa
/x-pack/test_serverless/**/services/ @elastic/appex-qa
/src/platform/packages/shared/kbn-es/src/stateful_resources/roles.yml @elastic/appex-qa
/x-pack/solutions/observability/test/api_integration_deployment_agnostic/ftr_provider_context.d.ts @elastic/appex-qa
/x-pack/solutions/observability/test/api_integration_deployment_agnostic/README.md @elastic/appex-qa
Expand Down Expand Up @@ -2257,9 +2240,7 @@ x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/se
/x-pack/solutions/search/test/api_integration/apis/search_playground/ @elastic/search-kibana

# workchat
/x-pack/test_serverless/api_integration/test_suites/chat @elastic/search-kibana @elastic/workchat-eng
/x-pack/solutions/chat/test/serverless/api_integration/configs/config.ts @elastic/search-kibana @elastic/appex-qa
/x-pack/test_serverless/functional/test_suites/chat/ @elastic/search-kibana
/x-pack/solutions/chat/test/serverless/functional/configs/config.ts @elastic/search-kibana @elastic/appex-qa

# Management Experience - Deployment Management
Expand Down Expand Up @@ -2321,22 +2302,16 @@ x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/se
/x-pack/platform/test/api_integration/apis/upgrade_assistant @elastic/kibana-management
/x-pack/platform/test/api_integration/apis/searchprofiler @elastic/kibana-management
/x-pack/platform/test/api_integration/apis/console @elastic/kibana-management
/x-pack/test_serverless/**/test_suites/common/index_management/ @elastic/kibana-management
/x-pack/platform/test/serverless/**/test_suites/index_management/ @elastic/kibana-management
/x-pack/test_serverless/**/test_suites/common/management/index_management/ @elastic/kibana-management
/x-pack/platform/test/serverless/functional/test_suites/management/ @elastic/kibana-management
/x-pack/test_serverless/**/test_suites/common/painless_lab/ @elastic/kibana-management
/x-pack/platform/test/serverless/**/test_suites/painless_lab/ @elastic/kibana-management
/x-pack/test_serverless/**/test_suites/common/console/ @elastic/kibana-management
/x-pack/platform/test/serverless/**/test_suites/console/ @elastic/kibana-management
/x-pack/platform/test/serverless/api_integration/test_suites/management/ @elastic/kibana-management
/x-pack/platform/test/serverless/api_integration/test_suites/search_profiler/ @elastic/kibana-management
/x-pack/test_serverless/functional/test_suites/**/advanced_settings.ts @elastic/kibana-management
/x-pack/platform/test/serverless/functional/test_suites/management/disabled_uis.ts @elastic/kibana-management
/x-pack/platform/test/serverless/functional/test_suites/management/ingest_pipelines.ts @elastic/kibana-management
/x-pack/platform/test/serverless/functional/test_suites/management/landing_page.ts @elastic/kibana-management
/x-pack/platform/test/serverless/functional/test_suites/dev_tools/ @elastic/kibana-management
/x-pack/test_serverless/**/test_suites/common/grok_debugger/ @elastic/kibana-management
/x-pack/platform/test/serverless/**/test_suites/grok_debugger/ @elastic/kibana-management
/x-pack/platform/test/api_integration/apis/management/ @elastic/kibana-management
/x-pack/platform/test/api_integration_deployment_agnostic/apis/management/ @elastic/kibana-management
Expand Down
1 change: 0 additions & 1 deletion .github/codeql/codeql-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ paths-ignore:
- x-pack/solutions/observability/packages/kbn-genai-cli
- x-pack/solutions/*/test
- x-pack/test
- x-pack/test_serverless
query-filters:
- exclude:
paths:
Expand Down
14 changes: 7 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ __tmp__
/x-pack/test/*/screenshots/visual_regression_gallery.html
/x-pack/test/functional/apps/*/*/reporting/reports/failure

# Ignore the same artifacts in x-pack/test_serverless
/x-pack/test_serverless/*/failure_debug
/x-pack/test_serverless/*/screenshots/diff
/x-pack/test_serverless/*/screenshots/failure
/x-pack/test_serverless/*/screenshots/session
/x-pack/test_serverless/*/screenshots/visual_regression_gallery.html
/x-pack/test_serverless/functional/apps/*/*/reporting/reports/failure
# Ignore the same artifacts in x-pack/platform/test/serverless and x-pack/solutions/*/test/serverless
/x-pack/**/test/serverless/*/failure_debug
/x-pack/**/test/serverless/*/screenshots/diff
/x-pack/**/test/serverless/*/screenshots/failure
/x-pack/**/test/serverless/*/screenshots/session
/x-pack/**/test/serverless/*/screenshots/visual_regression_gallery.html
/x-pack/**/test/serverless/functional/test_suites/*/*/reporting/reports/failure

/html_docs
.eslintcache
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -1589,7 +1589,6 @@
"@kbn/test-eui-helpers": "link:src/platform/packages/private/kbn-test-eui-helpers",
"@kbn/test-jest-helpers": "link:src/platform/packages/shared/kbn-test-jest-helpers",
"@kbn/test-subj-selector": "link:src/platform/packages/shared/kbn-test-subj-selector",
"@kbn/test-suites-serverless": "link:x-pack/test_serverless",
"@kbn/test-suites-src": "link:src/platform/test",
"@kbn/test-suites-xpack": "link:x-pack/test",
"@kbn/test-suites-xpack-chat": "link:x-pack/solutions/chat/test",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ export const aggregationGroups: string[] = [
'packages',
'src',
'x-pack/test',
'x-pack/test_serverless',
'test',
];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,11 @@ describe('identifyDependencyUsage', () => {
`x-pack/solutions/${solution}/packages`,
]).join('|');
expect(configWithDepth2.collapse).toMatchInlineSnapshot(
`"^(${solutionsFolders}|x-pack/platform/plugins|x-pack/platform/packages|x-pack/packages|src/platform/plugins|src/platform/packages|src/core/packages|packages|src|x-pack/test|x-pack/test_serverless|test)/([^/]+)/([^/]+)"`
`"^(${solutionsFolders}|x-pack/platform/plugins|x-pack/platform/packages|x-pack/packages|src/platform/plugins|src/platform/packages|src/core/packages|packages|src|x-pack/test|test)/([^/]+)/([^/]+)"`
);

expect(configWithDepth1.collapse).toMatchInlineSnapshot(
`"^(${solutionsFolders}|x-pack/platform/plugins|x-pack/platform/packages|x-pack/packages|src/platform/plugins|src/platform/packages|src/core/packages|packages|src|x-pack/test|x-pack/test_serverless|test)/([^/]+)|^node_modules/(@[^/]+/[^/]+|[^/]+)"`
`"^(${solutionsFolders}|x-pack/platform/plugins|x-pack/platform/packages|x-pack/packages|src/platform/plugins|src/platform/packages|src/core/packages|packages|src|x-pack/test|test)/([^/]+)|^node_modules/(@[^/]+/[^/]+|[^/]+)"`
);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ export function makeFtrConfigProvider(
const isServerless = !!process.env.TEST_SERVERLESS;
// Use the same serverless FTR config for all journeys
const configPath = isServerless
? 'x-pack/test_serverless/shared/config.base.ts'
? 'x-pack/platform/test/serverless/shared/config.base.ts'
: config.getFtrConfigPath();
const defaultConfigPath = config.isXpack()
? 'x-pack/test/functional/config.base.js'
? 'x-pack/platform/test/functional/config.base.ts'
: 'src/platform/test/functional/config.base.js';
const ftrConfigPath = configPath ?? defaultConfigPath;
const baseConfig = (await readConfigFile(Path.resolve(REPO_ROOT, ftrConfigPath))).getAll();
Expand Down
Loading