Skip to content

Commit 858dbfd

Browse files
stratoulastratoula
authored
Merge branch 'main' into timeseries-functions-esql
2 parents e5c3074 + b38683e commit 858dbfd

2,370 files changed

Lines changed: 38693 additions & 15010 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.buildkite/ftr_base_serverless_configs.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,16 @@ disabled:
22
# Base config files, only necessary to inform config finding script
33

44
# Serverless deployment-agnostic default config for api-integration tests
5-
- x-pack/test/api_integration/deployment_agnostic/default_configs/serverless.config.base.ts
6-
- x-pack/test/api_integration/deployment_agnostic/default_configs/feature_flag.serverless.config.base.ts
5+
- x-pack/platform/test/api_integration_deployment_agnostic/default_configs/serverless.config.base.ts
6+
- x-pack/platform/test/api_integration_deployment_agnostic/default_configs/feature_flag.serverless.config.base.ts
77
# Serverless base config files
88
- x-pack/test_serverless/api_integration/config.base.ts
99
- x-pack/test_serverless/functional/config.base.ts
1010
- x-pack/test_serverless/shared/config.base.ts
11+
12+
enabled:
13+
# Serverless deployment-agnostic configs to run platform api-integration tests
14+
- x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/oblt.serverless.config.ts
15+
- x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/search.serverless.config.ts
16+
- x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/security.serverless.config.ts
17+
- x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/oblt.logs_essentials.serverless.config.ts

‎.buildkite/ftr_oblt_serverless_configs.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ enabled:
4141
- x-pack/test_serverless/functional/test_suites/observability/config.telemetry.ts
4242
# serverless config files that run deployment-agnostic tests
4343
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts
44-
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.logs_essentials.serverless.config.ts
4544
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.ai_assistant.serverless.config.ts
4645
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.apm.serverless.config.ts
4746
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.synthetics.serverless.config.ts

‎.buildkite/ftr_platform_stateful_configs.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
disabled:
22
# Stateful base config for deployment-agnostic tests
3+
- x-pack/platform/test/api_integration_deployment_agnostic/default_configs/stateful.config.base.ts
4+
- x-pack/platform/test/api_integration_deployment_agnostic/default_configs/feature_flag.stateful.config.base.ts
35
- x-pack/test/api_integration/deployment_agnostic/default_configs/stateful.config.base.ts
46
- x-pack/test/api_integration/deployment_agnostic/default_configs/feature_flag.stateful.config.base.ts
5-
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/default_configs/serverless.config.base.ts
6-
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/default_configs/stateful.config.base.ts
77

88
# Base config files, only necessary to inform config finding script
99
- src/platform/test/functional/config.base.js
@@ -23,7 +23,7 @@ disabled:
2323

2424
# QA suites that are run out-of-band
2525
- x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js
26-
- x-pack/test/upgrade/config.ts
26+
- x-pack/platform/test/upgrade/config.ts
2727
- src/platform/test/functional/config.edge.js
2828
- x-pack/platform/test/functional/config.edge.ts
2929
- x-pack/test/functional/config.edge.js
@@ -59,6 +59,7 @@ enabled:
5959
- src/platform/test/accessibility/config.ts
6060
- src/platform/test/analytics/config.ts
6161
- src/platform/test/api_integration/config.js
62+
- src/platform/test/api_integration/apis/unused_urls_task/config.ts
6263
- src/platform/test/examples/config.js
6364
- src/platform/test/functional/apps/bundles/config.ts
6465
- src/platform/test/functional/apps/console/config.ts
@@ -277,8 +278,8 @@ enabled:
277278
- x-pack/platform/test/functional_cloud/config.ts
278279
- x-pack/platform/test/functional_cloud/saml.config.ts
279280
- x-pack/test/functional_solution_sidenav/config.ts
280-
- x-pack/test/licensing_plugin/config.public.ts
281-
- x-pack/test/licensing_plugin/config.ts
281+
- x-pack/platform/test/licensing_plugin/config.public.ts
282+
- x-pack/platform/test/licensing_plugin/config.ts
282283
- x-pack/test/plugin_functional/config.ts
283284
- x-pack/platform/test/reporting_api_integration/reporting_and_security.config.ts
284285
- x-pack/platform/test/reporting_api_integration/reporting_without_security.config.ts
@@ -293,7 +294,7 @@ enabled:
293294
- x-pack/test/saved_object_tagging/api_integration/tagging_usage_collection/config.ts
294295
- x-pack/test/saved_object_tagging/functional/config.ts
295296
- x-pack/test/saved_objects_field_count/config.ts
296-
- x-pack/test/search_sessions_integration/config.ts
297+
- x-pack/platform/test/search_sessions_integration/config.ts
297298
- x-pack/test/security_api_integration/anonymous_es_anonymous.config.ts
298299
- x-pack/test/security_api_integration/anonymous.config.ts
299300
- x-pack/test/security_api_integration/api_keys.config.ts
@@ -336,7 +337,7 @@ enabled:
336337
- x-pack/platform/test/ui_capabilities/security_and_spaces/config.ts
337338
- x-pack/platform/test/ui_capabilities/spaces_only/config.ts
338339
- x-pack/test/upgrade_assistant_integration/config.ts
339-
- x-pack/test/usage_collection/config.ts
340+
- x-pack/platform/test/usage_collection/config.ts
340341
- x-pack/performance/journeys_e2e/aiops_log_rate_analysis.ts
341342
- x-pack/performance/journeys_e2e/ecommerce_dashboard.ts
342343
- x-pack/performance/journeys_e2e/ecommerce_dashboard_http2.ts
@@ -362,8 +363,6 @@ enabled:
362363
- x-pack/performance/journeys_e2e/apm_service_inventory.ts
363364
- x-pack/performance/journeys_e2e/infra_hosts_view.ts
364365
- x-pack/test/custom_branding/config.ts
365-
# stateful config files that run deployment-agnostic tests
366-
- x-pack/test/api_integration/deployment_agnostic/configs/stateful/platform.stateful.config.ts
367366
# configs migrated to the new Kibana architecture
368367
- x-pack/platform/test/api_integration/apis/aiops/config.ts
369368
- x-pack/platform/test/api_integration/apis/cloud/config.ts
@@ -409,4 +408,5 @@ enabled:
409408
- x-pack/platform/test/saved_object_api_integration/spaces_only/config.ts
410409
- x-pack/platform/test/saved_object_api_integration/low-level/config.ts
411410
- x-pack/platform/test/saved_object_api_integration/user_profiles/config.ts
412-
- src/platform/test/api_integration/apis/unused_urls_task/config.ts
411+
# stateful config files that run deployment-agnostic tests
412+
- x-pack/platform/test/api_integration_deployment_agnostic/configs/stateful/platform.stateful.config.ts

‎.buildkite/ftr_search_serverless_configs.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,3 @@ enabled:
2525
- x-pack/test_serverless/functional/test_suites/search/common_configs/config.group10.ts
2626
- x-pack/test_serverless/functional/test_suites/search/common_configs/config.group11.ts
2727
- x-pack/test_serverless/functional/test_suites/search/common_configs/config.group12.ts
28-
# serverless config files that run deployment-agnostic tests
29-
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/search.serverless.config.ts

‎.buildkite/ftr_security_serverless_configs.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,5 @@ enabled:
131131
- x-pack/test/security_solution_api_integration/test_suites/ai4dsoc/cases/search_ai_lake_tier/configs/serverless.config.ts
132132
- x-pack/test/security_solution_api_integration/test_suites/ai4dsoc/nlp_cleanup_task/search_ai_lake_tier/configs/serverless.config.ts
133133
# serverless config files that run deployment-agnostic tests
134-
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/security.serverless.config.ts
135134
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/security_and_spaces/serverless.config.ts
136135
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/security_and_spaces/serverless.copy_to_space.config.ts

‎.buildkite/ftr_security_stateful_configs.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ enabled:
120120
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/security_and_spaces/stateful.config_trial.ts
121121
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/security_and_spaces/stateful.copy_to_space.config_trial.ts
122122
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/security_and_spaces/stateful.copy_to_space.config_basic.ts
123-
- x-pack/solutions/security/test/alerting_api_integration/security_and_spaces/group1/config.ts
124123
- x-pack/solutions/security/test/alerting_api_integration/security_and_spaces/group2/config.ts
125124
- x-pack/solutions/security/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts
126125
- x-pack/solutions/security/test/cases_api_integration/security_and_spaces/config_trial.ts

‎.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ steps:
5454
env:
5555
FTR_CONFIGS_SCRIPT: "TEST_ES_SERVERLESS_IMAGE=$ES_SERVERLESS_IMAGE .buildkite/scripts/steps/test/ftr_configs.sh"
5656
JEST_INTEGRATION_SCRIPT: "TEST_ES_SERVERLESS_IMAGE=$ES_SERVERLESS_IMAGE .buildkite/scripts/steps/test/jest_integration.sh"
57-
FTR_CONFIG_PATTERNS: "**/test_serverless/**,**/test/security_solution_api_integration/**/serverless.config.ts,x-pack/test/api_integration/deployment_agnostic/configs/serverless/**"
57+
FTR_CONFIG_PATTERNS: "**/test_serverless/**,**/test/security_solution_api_integration/**/serverless.config.ts,x-pack/test/api_integration/deployment_agnostic/configs/serverless/**,x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/**"
5858
FTR_EXTRA_ARGS: "$FTR_EXTRA_ARGS"
5959
LIMIT_CONFIG_TYPE: "functional,integration"
6060
retry:

‎.eslintrc.js‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,8 @@ module.exports = {
776776
'x-pack/test/apm_api_integration/**/*.ts',
777777
'x-pack/test/functional/apps/**/*.js',
778778
'x-pack/solutions/observability/plugins/apm/**/*.js',
779-
'x-pack/platform/test/*/{tests,test_suites,apis,apps,deployment_agnostic}/**/*',
779+
'x-pack/platform/test/*/{tests,test_suites,apis,apps}/**/*',
780+
'x-pack/platform/test/*api_integration*/**/*',
780781
'x-pack/platform/test/*/*config.*ts',
781782
'x-pack/solutions/*/test/**/{tests,test_suites,apis,apps,deployment_agnostic,fixtures}/**/*',
782783
'x-pack/solutions/*/test/**/*config.*ts',
@@ -1595,9 +1596,9 @@ module.exports = {
15951596
'src/platform/packages/shared/kbn-scout/src/playwright/**/*.ts',
15961597
'x-pack/solutions/observability/packages/kbn-scout-oblt/src/playwright/**/*.ts',
15971598
'x-pack/solutions/security/packages/kbn-scout-security/src/playwright/**/*.ts',
1598-
'src/platform/plugins/**/ui_tests/**/*.ts',
1599-
'x-pack/platform/plugins/**/ui_tests/**/*.ts',
1600-
'x-pack/solutions/**/plugins/**/ui_tests/**/*.ts',
1599+
'src/platform/plugins/**/test/scout/**/*.ts',
1600+
'x-pack/platform/plugins/**/test/scout/**/*.ts',
1601+
'x-pack/solutions/**/plugins/**/test/scout/**/*.ts',
16011602
],
16021603
excludedFiles: ['src/platform/packages/shared/kbn-scout/src/playwright/**/*.test.ts'],
16031604
extends: ['plugin:playwright/recommended'],
@@ -2318,8 +2319,8 @@ module.exports = {
23182319
},
23192320
{
23202321
files: [
2321-
'src/platform/plugins/**/ui_tests/**/*.ts',
2322-
'x-pack/platform/**/plugins/**/ui_tests/**/*.ts',
2322+
'src/platform/plugins/**/test/scout/**/*.ts',
2323+
'x-pack/platform/**/plugins/**/test/scout/**/*.ts',
23232324
],
23242325
rules: {
23252326
'no-restricted-imports': [
@@ -2340,7 +2341,7 @@ module.exports = {
23402341
},
23412342
},
23422343
{
2343-
files: ['x-pack/solutions/observability/plugins/**/ui_tests/**/*.ts'],
2344+
files: ['x-pack/solutions/observability/plugins/**/test/scout/**/*.ts'],
23442345
rules: {
23452346
'no-restricted-imports': [
23462347
'error',
@@ -2367,7 +2368,7 @@ module.exports = {
23672368
},
23682369
},
23692370
{
2370-
files: ['x-pack/solutions/security/plugins/**/ui_tests/**/*.ts'],
2371+
files: ['x-pack/solutions/security/plugins/**/test/scout/**/*.ts'],
23712372
rules: {
23722373
'no-restricted-imports': [
23732374
'error',

0 commit comments

Comments
 (0)