Skip to content

Commit 61d6ebb

Browse files
authored
Merge branch 'main' into scout/add-core-settings-api
2 parents a560636 + 5e1d6d7 commit 61d6ebb

2,596 files changed

Lines changed: 37267 additions & 12447 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_oblt_stateful_configs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ disabled:
2020
- x-pack/solutions/observability/plugins/ux/e2e/synthetics_run.ts
2121
- x-pack/solutions/observability/plugins/slo/e2e/synthetics_run.ts
2222

23+
# Configs that exist but weren't running in CI when this file was introduced
24+
- x-pack/solutions/observability/test/screenshot_creation/config.ts
25+
2326
# Observability AI Assistant local-only tests
2427
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/stateful/oblt.ai_assistant_local.stateful.config.ts
2528

@@ -58,3 +61,4 @@ enabled:
5861
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/stateful/oblt.apm.stateful.config.ts
5962
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/stateful/oblt.ai_assistant.stateful.config.ts
6063
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/feature_flag_configs/stateful/oblt.stateful.config.ts
64+
- x-pack/solutions/observability/test/functional_solution_sidenav/config.ts

.buildkite/ftr_platform_stateful_configs.yml

Lines changed: 57 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ disabled:
3232
- x-pack/platform/test/cloud_integration/config.ts
3333
- x-pack/platform/test/load/config.ts
3434
- x-pack/platform/test/plugin_api_perf/config.ts
35-
- x-pack/test/screenshot_creation/config.ts
3635
- x-pack/platform/test/screenshot_creation/config.ts
3736
- x-pack/platform/test/fleet_packages/config.ts
3837

@@ -50,7 +49,7 @@ disabled:
5049
- x-pack/performance/configs/http2_config.ts
5150

5251
# Gen AI suites, running with their own pipeline
53-
- x-pack/test/functional_gen_ai/inference/config.ts
52+
- x-pack/platform/test/functional_gen_ai/inference/config.ts
5453

5554
defaultQueue: 'n2-4-spot'
5655
enabled:
@@ -165,17 +164,14 @@ enabled:
165164
- x-pack/platform/test/cases_api_integration/spaces_only/config.ts
166165
- x-pack/platform/test/disable_ems/config.ts
167166
- x-pack/platform/test/examples/config.ts
168-
- x-pack/test/fleet_api_integration/config.agent.ts
169-
- x-pack/test/fleet_api_integration/config.epm.ts
170-
- x-pack/test/fleet_api_integration/config.package_policy.ts
171167
- x-pack/platform/test/fleet_api_integration/config.agent.ts
172168
- x-pack/platform/test/fleet_api_integration/config.agent_policy.ts
173169
- x-pack/platform/test/fleet_api_integration/config.epm.ts
174170
- x-pack/platform/test/fleet_api_integration/config.event_ingested.ts
175171
- x-pack/platform/test/fleet_api_integration/config.fleet.ts
176172
- x-pack/platform/test/fleet_api_integration/config.package_policy.ts
177173
- x-pack/platform/test/fleet_api_integration/config.space_awareness.ts
178-
- x-pack/test/fleet_functional/config.ts
174+
- x-pack/platform/test/fleet_functional/config.ts
179175
- x-pack/platform/test/fleet_tasks/config.ts
180176
- x-pack/platform/test/ftr_apis/security_and_spaces/config.ts
181177
- x-pack/platform/test/functional_basic/apps/ml/permissions/config.ts
@@ -201,22 +197,22 @@ enabled:
201197
- x-pack/platform/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors/with_email_services_enabled_kbn_config/config.ts
202198
- x-pack/platform/test/functional_with_es_ssl/apps/triggers_actions_ui/shared/config.ts
203199
- x-pack/platform/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors/webhook_disabled_ssl_pfx/config.ts
204-
- x-pack/test/functional/apps/advanced_settings/config.ts
200+
- x-pack/platform/test/functional/apps/advanced_settings/config.ts
205201
- x-pack/platform/test/functional/apps/aiops/config.ts
206-
- x-pack/test/functional/apps/api_keys/config.ts
202+
- x-pack/platform/test/functional/apps/api_keys/config.ts
207203
- x-pack/platform/test/functional/apps/canvas/config.ts
208-
- x-pack/test/functional/apps/cross_cluster_replication/config.ts
204+
- x-pack/platform/test/functional/apps/cross_cluster_replication/config.ts
209205
- x-pack/test/functional/apps/dashboard/group1/config.ts
210206
- x-pack/test/functional/apps/dashboard/group2/config.ts
211207
- x-pack/test/functional/apps/dashboard/group3/config.ts
212-
- x-pack/test/functional/apps/data_views/config.ts
208+
- x-pack/platform/test/functional/apps/data_views/config.ts
213209
- x-pack/platform/test/functional/apps/dev_tools/config.ts
214210
- x-pack/test/functional/apps/discover/group1/config.ts
215211
- x-pack/test/functional/apps/discover/group2/config.ts
216212
- x-pack/test/functional/apps/discover/group3/config.ts
217-
- x-pack/test/functional/apps/graph/config.ts
218-
- x-pack/test/functional/apps/grok_debugger/config.ts
219-
- x-pack/test/functional/apps/home/config.ts
213+
- x-pack/platform/test/functional/apps/graph/config.ts
214+
- x-pack/platform/test/functional/apps/grok_debugger/config.ts
215+
- x-pack/platform/test/functional/apps/home/config.ts
220216
- x-pack/test/functional/apps/index_lifecycle_management/config.ts
221217
- x-pack/test/functional/apps/index_management/config.ts
222218
- x-pack/test/functional/apps/ingest_pipelines/config.ts
@@ -230,10 +226,10 @@ enabled:
230226
- x-pack/test/functional/apps/lens/open_in_lens/tsvb/config.ts
231227
- x-pack/test/functional/apps/lens/open_in_lens/agg_based/config.ts
232228
- x-pack/test/functional/apps/lens/open_in_lens/dashboard/config.ts
233-
- x-pack/test/functional/apps/license_management/config.ts
229+
- x-pack/platform/test/functional/apps/license_management/config.ts
234230
- x-pack/test/functional/apps/logstash/config.ts
235-
- x-pack/test/functional/apps/managed_content/config.ts
236-
- x-pack/test/functional/apps/management/config.ts
231+
- x-pack/platform/test/functional/apps/managed_content/config.ts
232+
- x-pack/platform/test/functional/apps/management/config.ts
237233
- x-pack/test/functional/apps/maps/group1/config.ts
238234
- x-pack/test/functional/apps/maps/group2/config.ts
239235
- x-pack/test/functional/apps/maps/group3/config.ts
@@ -275,66 +271,65 @@ enabled:
275271
- x-pack/platform/test/functional/config.upgrade_assistant.ts
276272
- x-pack/platform/test/functional_cloud/config.ts
277273
- x-pack/platform/test/functional_cloud/saml.config.ts
278-
- x-pack/test/functional_solution_sidenav/config.ts
279274
- x-pack/platform/test/licensing_plugin/config.public.ts
280275
- x-pack/platform/test/licensing_plugin/config.ts
281276
- x-pack/test/plugin_functional/config.ts
282277
- x-pack/platform/test/reporting_api_integration/reporting_and_security.config.ts
283278
- x-pack/platform/test/reporting_api_integration/reporting_without_security.config.ts
284279
- x-pack/platform/test/reporting_functional/reporting_and_security.config.ts
285280
- x-pack/platform/test/reporting_functional/reporting_without_security.config.ts
286-
- x-pack/test/rule_registry/security_and_spaces/config_basic.ts
287-
- x-pack/test/rule_registry/security_and_spaces/config_trial.ts
288-
- x-pack/test/rule_registry/spaces_only/config_basic.ts
289-
- x-pack/test/rule_registry/spaces_only/config_trial.ts
290-
- x-pack/test/saved_object_tagging/api_integration/security_and_spaces/config.ts
291-
- x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts
292-
- x-pack/test/saved_object_tagging/api_integration/tagging_usage_collection/config.ts
293-
- x-pack/test/saved_object_tagging/functional/config.ts
281+
- x-pack/platform/test/rule_registry/security_and_spaces/config_basic.ts
282+
- x-pack/platform/test/rule_registry/security_and_spaces/config_trial.ts
283+
- x-pack/platform/test/rule_registry/spaces_only/config_basic.ts
284+
- x-pack/platform/test/rule_registry/spaces_only/config_trial.ts
285+
- x-pack/platform/test/saved_object_tagging/api_integration/security_and_spaces/config.ts
286+
- x-pack/platform/test/saved_object_tagging/api_integration/tagging_api/config.ts
287+
- x-pack/platform/test/saved_object_tagging/api_integration/tagging_usage_collection/config.ts
288+
- x-pack/platform/test/saved_object_tagging/functional/config.ts
294289
- x-pack/platform/test/saved_objects_field_count/config.ts
295290
- x-pack/platform/test/search_sessions_integration/config.ts
296-
- x-pack/test/security_api_integration/anonymous_es_anonymous.config.ts
297-
- x-pack/test/security_api_integration/anonymous.config.ts
298-
- x-pack/test/security_api_integration/api_keys.config.ts
299-
- x-pack/test/security_api_integration/audit.config.ts
300-
- x-pack/test/security_api_integration/http_bearer.config.ts
301-
- x-pack/test/security_api_integration/http_no_auth_providers.config.ts
302-
- x-pack/test/security_api_integration/kerberos_anonymous_access.config.ts
303-
- x-pack/test/security_api_integration/kerberos.config.ts
304-
- x-pack/test/security_api_integration/login_selector.config.ts
305-
- x-pack/test/security_api_integration/oidc_implicit_flow.config.ts
306-
- x-pack/test/security_api_integration/oidc.config.ts
307-
- x-pack/test/security_api_integration/oidc.http2.config.ts
308-
- x-pack/test/security_api_integration/pki.config.ts
309-
- x-pack/test/security_api_integration/saml.config.ts
310-
- x-pack/test/security_api_integration/saml.http2.config.ts
311-
- x-pack/test/security_api_integration/saml_cloud.config.ts
312-
- x-pack/test/security_api_integration/chips.config.ts
313-
- x-pack/test/security_api_integration/features.config.ts
314-
- x-pack/test/security_api_integration/session_cookie.config.ts
315-
- x-pack/test/security_api_integration/session_idle.config.ts
316-
- x-pack/test/security_api_integration/session_shard_missing.config.ts
317-
- x-pack/test/security_api_integration/session_invalidate.config.ts
318-
- x-pack/test/security_api_integration/session_lifespan.config.ts
319-
- x-pack/test/security_api_integration/session_concurrent_limit.config.ts
320-
- x-pack/test/security_api_integration/token.config.ts
321-
- x-pack/test/security_api_integration/user_profiles.config.ts
322-
- x-pack/test/security_functional/login_selector.config.ts
323-
- x-pack/test/security_functional/oidc.config.ts
324-
- x-pack/test/security_functional/saml.config.ts
325-
- x-pack/test/security_functional/saml.http2.config.ts
326-
- x-pack/test/security_functional/oidc.http2.config.ts
327-
- x-pack/test/security_functional/insecure_cluster_warning.config.ts
328-
- x-pack/test/security_functional/user_profiles.config.ts
329-
- x-pack/test/security_functional/expired_session.config.ts
330-
- x-pack/test/session_view/basic/config.ts
291+
- x-pack/platform/test/security_api_integration/anonymous_es_anonymous.config.ts
292+
- x-pack/platform/test/security_api_integration/anonymous.config.ts
293+
- x-pack/platform/test/security_api_integration/api_keys.config.ts
294+
- x-pack/platform/test/security_api_integration/audit.config.ts
295+
- x-pack/platform/test/security_api_integration/http_bearer.config.ts
296+
- x-pack/platform/test/security_api_integration/http_no_auth_providers.config.ts
297+
- x-pack/platform/test/security_api_integration/kerberos_anonymous_access.config.ts
298+
- x-pack/platform/test/security_api_integration/kerberos.config.ts
299+
- x-pack/platform/test/security_api_integration/login_selector.config.ts
300+
- x-pack/platform/test/security_api_integration/oidc_implicit_flow.config.ts
301+
- x-pack/platform/test/security_api_integration/oidc.config.ts
302+
- x-pack/platform/test/security_api_integration/oidc.http2.config.ts
303+
- x-pack/platform/test/security_api_integration/pki.config.ts
304+
- x-pack/platform/test/security_api_integration/saml.config.ts
305+
- x-pack/platform/test/security_api_integration/saml.http2.config.ts
306+
- x-pack/platform/test/security_api_integration/saml_cloud.config.ts
307+
- x-pack/platform/test/security_api_integration/chips.config.ts
308+
- x-pack/platform/test/security_api_integration/features.config.ts
309+
- x-pack/platform/test/security_api_integration/session_cookie.config.ts
310+
- x-pack/platform/test/security_api_integration/session_idle.config.ts
311+
- x-pack/platform/test/security_api_integration/session_shard_missing.config.ts
312+
- x-pack/platform/test/security_api_integration/session_invalidate.config.ts
313+
- x-pack/platform/test/security_api_integration/session_lifespan.config.ts
314+
- x-pack/platform/test/security_api_integration/session_concurrent_limit.config.ts
315+
- x-pack/platform/test/security_api_integration/token.config.ts
316+
- x-pack/platform/test/security_api_integration/user_profiles.config.ts
317+
- x-pack/platform/test/security_functional/login_selector.config.ts
318+
- x-pack/platform/test/security_functional/oidc.config.ts
319+
- x-pack/platform/test/security_functional/saml.config.ts
320+
- x-pack/platform/test/security_functional/saml.http2.config.ts
321+
- x-pack/platform/test/security_functional/oidc.http2.config.ts
322+
- x-pack/platform/test/security_functional/insecure_cluster_warning.config.ts
323+
- x-pack/platform/test/security_functional/user_profiles.config.ts
324+
- x-pack/platform/test/security_functional/expired_session.config.ts
325+
- x-pack/solutions/security/test/session_view/basic/config.ts
331326
- x-pack/platform/test/spaces_api_integration/security_and_spaces/config_basic.ts
332327
- x-pack/platform/test/spaces_api_integration/security_and_spaces/config_trial.ts
333328
- x-pack/platform/test/spaces_api_integration/spaces_only/config.ts
334329
- x-pack/platform/test/task_manager_claimer_update_by_query/config.ts
335330
- x-pack/platform/test/ui_capabilities/security_and_spaces/config.ts
336331
- x-pack/platform/test/ui_capabilities/spaces_only/config.ts
337-
- x-pack/test/upgrade_assistant_integration/config.ts
332+
- x-pack/platform/test/upgrade_assistant_integration/config.ts
338333
- x-pack/platform/test/usage_collection/config.ts
339334
- x-pack/performance/journeys_e2e/aiops_log_rate_analysis.ts
340335
- x-pack/performance/journeys_e2e/ecommerce_dashboard.ts
@@ -401,6 +396,7 @@ enabled:
401396
- x-pack/platform/test/encrypted_saved_objects_api_integration/config.ts
402397
- x-pack/platform/test/fleet_multi_cluster/config.ts
403398
- x-pack/platform/test/monitoring_api_integration/config.ts
399+
- x-pack/platform/test/onechat_api_integration/config.ts
404400
- x-pack/platform/test/plugin_api_integration/config.ts
405401
- x-pack/platform/test/saved_object_api_integration/security_and_spaces/config_basic.ts
406402
- x-pack/platform/test/saved_object_api_integration/security_and_spaces/config_trial.ts

.buildkite/ftr_search_stateful_configs.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ disabled:
44

55
defaultQueue: 'n2-4-spot'
66
enabled:
7-
- x-pack/test/functional_search/config.ts
7+
- x-pack/solutions/search/test/functional_search/config.ts
88
- x-pack/test/functional/apps/search_playground/config.ts
9-
- x-pack/solutions/search/test/functional_search/config/config.feature_flags.ts
9+
- x-pack/solutions/search/test/functional/config/config.feature_flags.ts
1010
- x-pack/solutions/search/test/api_integration/apis/search_playground/config.ts
1111
- x-pack/solutions/search/test/api_integration/apis/guided_onboarding/config.ts
12+
- x-pack/solutions/search/test/functional_solution_sidenav/config.ts

.buildkite/ftr_security_serverless_configs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ enabled:
9898
- x-pack/test/security_solution_api_integration/test_suites/genai/nlp_cleanup_task/basic_license_essentials_tier/configs/serverless.config.ts
9999
- x-pack/test/security_solution_api_integration/test_suites/genai/knowledge_base/entries/trial_license_complete_tier/configs/ess.config.ts
100100
- x-pack/test/security_solution_api_integration/test_suites/genai/knowledge_base/entries/trial_license_complete_tier/configs/serverless.config.ts
101+
- x-pack/test/security_solution_api_integration/test_suites/genai/attack_discovery/schedules/trial_license_complete_tier/configs/ess.config.ts
102+
- x-pack/test/security_solution_api_integration/test_suites/genai/attack_discovery/schedules/trial_license_complete_tier/configs/serverless.config.ts
103+
- x-pack/test/security_solution_api_integration/test_suites/genai/attack_discovery/schedules/basic_license_essentials_tier/configs/ess.config.ts
104+
- x-pack/test/security_solution_api_integration/test_suites/genai/attack_discovery/schedules/basic_license_essentials_tier/configs/serverless.config.ts
101105
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/configs/serverless.config.ts
102106
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/basic_license_essentials_tier/configs/serverless.config.ts
103107
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/entity_store/trial_license_complete_tier/configs/serverless.config.ts

.buildkite/ftr_security_stateful_configs.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ disabled:
1414
# QA suites that are run out-of-band
1515
- x-pack/solutions/security/test/cloud_security_posture_functional/config.cloud.ts
1616

17+
# Configs that exist but weren't running in CI when this file was introduced
18+
- x-pack/solutions/security/test/screenshot_creation/config.ts
19+
1720
# Cypress configs, for now these are still run manually
1821
- x-pack/solutions/security/test/defend_workflows_cypress/cli_config.ts
1922
- x-pack/solutions/security/test/defend_workflows_cypress/config.ts
@@ -127,3 +130,7 @@ enabled:
127130
- x-pack/solutions/security/test/cases_api_integration/security_and_spaces/config_trial_common.ts
128131
- x-pack/solutions/security/test/api_integration_basic/config.ts
129132
- x-pack/solutions/security/test/api_integration/apis/cases/config.ts
133+
- x-pack/solutions/security/test/fleet_api_integration/config.agent.ts
134+
- x-pack/solutions/security/test/fleet_api_integration/config.epm.ts
135+
- x-pack/solutions/security/test/fleet_api_integration/config.package_policy.ts
136+
- x-pack/solutions/security/test/functional_solution_sidenav/config.ts

.buildkite/pipelines/gen_ai_testing.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
env:
2-
FTR_GEN_AI: "1"
2+
FTR_GEN_AI: '1'
33
steps:
44
- label: '👨‍🔧 Pre-Build'
55
command: .buildkite/scripts/lifecycle/pre_build.sh
@@ -25,9 +25,9 @@ steps:
2525

2626
- command: .buildkite/scripts/steps/test/ftr_configs.sh
2727
env:
28-
FTR_CONFIG: "x-pack/test/functional_gen_ai/inference/config.ts"
28+
FTR_CONFIG: 'x-pack/platform/test/functional_gen_ai/inference/config.ts'
2929
FTR_CONFIG_GROUP_KEY: 'ftr-ai-infra-gen-ai-inference-api'
30-
FTR_GEN_AI: "1"
30+
FTR_GEN_AI: '1'
3131
label: AppEx AI-Infra Inference APIs FTR tests
3232
key: ai-infra-gen-ai-inference-api
3333
timeout_in_minutes: 50
@@ -44,5 +44,3 @@ steps:
4444
limit: 3
4545
- exit_status: '*'
4646
limit: 1
47-
48-

.buildkite/pipelines/pull_request/ai_infra_gen_ai.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ steps:
1212
steps:
1313
- command: .buildkite/scripts/steps/test/ftr_configs.sh
1414
env:
15-
FTR_CONFIG: "x-pack/test/functional_gen_ai/inference/config.ts"
15+
FTR_CONFIG: 'x-pack/platform/test/functional_gen_ai/inference/config.ts'
1616
FTR_CONFIG_GROUP_KEY: 'ftr-ai-infra-gen-ai-inference-api'
17-
FTR_GEN_AI: "1"
17+
FTR_GEN_AI: '1'
1818
label: AppEx AI-Infra Inference APIs FTR tests
1919
key: ai-infra-gen-ai-inference-api
2020
timeout_in_minutes: 50

.eslintrc.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ module.exports = {
788788
'x-pack/test/*/*config.*ts',
789789
'x-pack/platform/test/saved_object_api_integration/*/apis/**/*',
790790
'x-pack/platform/test/ui_capabilities/*/tests/**/*',
791-
'x-pack/test/upgrade_assistant_integration/**/*',
791+
'x-pack/platform/test/upgrade_assistant_integration/**/*',
792792
'x-pack/test/performance/**/*.ts',
793793
'**/cypress.config.{js,ts}',
794794
'x-pack/test_serverless/**/config*.ts',
@@ -1812,7 +1812,7 @@ module.exports = {
18121812
'x-pack/platform/test/alerting_api_integration/**/*.{ts, tsx}',
18131813
'x-pack/platform/test/cases_api_integration/**/*.{ts, tsx}',
18141814
'x-pack/solutions/**/test/cases_api_integration/**/*.{ts, tsx}',
1815-
'x-pack/test/rule_registry/**/*.{ts, tsx}',
1815+
'x-pack/platform/test/rule_registry/**/*.{ts, tsx}',
18161816
'x-pack/test/api_integration/apis/cases/**/*.{ts, tsx}',
18171817
],
18181818
rules: {
@@ -2113,8 +2113,8 @@ module.exports = {
21132113
'x-pack/platform/plugins/shared/security/**/*.{js,mjs,ts,tsx}',
21142114
'x-pack/platform/packages/private/security/**/*.{js,mjs,ts,tsx}',
21152115
'x-pack/platform/packages/shared/security/**/*.{js,mjs,ts,tsx}',
2116-
'x-pack/test/security_api_integration/**/*.{js,mjs,ts,tsx}',
2117-
'x-pack/test/security_functional/**/*.{js,mjs,ts,tsx}',
2116+
'x-pack/platform/test/security_api_integration/**/*.{js,mjs,ts,tsx}',
2117+
'x-pack/platform/test/security_functional/**/*.{js,mjs,ts,tsx}',
21182118

21192119
'x-pack/platform/plugins/shared/spaces/**/*.{js,mjs,ts,tsx}',
21202120
'x-pack/platform/test/spaces_api_integration/**/*.{js,mjs,ts,tsx}',

0 commit comments

Comments
 (0)