Skip to content

Commit 1e7ce7b

Browse files
adcoelhoadcoelho
committed
Merge remote-tracking branch 'upstream/8.19' into backport/8.19/pr-225231
2 parents 9328d44 + 52788c4 commit 1e7ce7b

875 files changed

Lines changed: 9224 additions & 6331 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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ enabled:
4444
- x-pack/test/observability_ai_assistant_functional/enterprise/config.ts
4545
- x-pack/solutions/observability/test/api_integration/profiling/cloud/config.ts
4646
- x-pack/test/functional/apps/apm/config.ts
47+
- x-pack/test/functional_with_es_ssl/apps/config.ts
4748
# stateful configs that run deployment-agnostic tests
4849
- x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts
4950
- x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.apm.stateful.config.ts

‎.buildkite/ftr_platform_stateful_configs.yml‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ disabled:
1010
- x-pack/platform/test/functional/config.base.ts
1111
- x-pack/platform/test/localization/config.base.ts
1212
- src/platform/test/server_integration/config.base.js
13-
- x-pack/test/functional_with_es_ssl/config.base.ts
13+
- x-pack/platform/test/functional_with_es_ssl/config.base.ts
1414
- x-pack/test/api_integration/config.ts
1515
- x-pack/platform/test/api_integration/config.ts
1616
- x-pack/test/fleet_api_integration/config.base.ts
@@ -34,6 +34,7 @@ disabled:
3434
- x-pack/platform/test/load/config.ts
3535
- x-pack/platform/test/plugin_api_perf/config.ts
3636
- x-pack/test/screenshot_creation/config.ts
37+
- x-pack/platform/test/screenshot_creation/config.ts
3738
- x-pack/platform/test/fleet_packages/config.ts
3839

3940
# Scalability testing config that we run in its own pipeline
@@ -185,18 +186,18 @@ enabled:
185186
- x-pack/platform/test/functional_cors/config.ts
186187
- x-pack/platform/test/functional_embedded/config.ts
187188
- x-pack/platform/test/functional_execution_context/config.ts
188-
- x-pack/test/functional_with_es_ssl/apps/cases/group1/config.ts
189-
- x-pack/test/functional_with_es_ssl/apps/cases/group2/config.ts
190-
- x-pack/test/functional_with_es_ssl/apps/cases/basic/config.ts
191-
- x-pack/test/functional_with_es_ssl/apps/discover_ml_uptime/config.ts
192-
- x-pack/test/functional_with_es_ssl/apps/embeddable_alerts_table/config.ts
193-
- x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/config.ts
194-
- x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors/with_email_aws_ses_kbn_config/config.ts
195-
- x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors/with_email_services_enabled_kbn_config/config.ts
196-
- x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/shared/config.ts
197-
- x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors/webhook_disabled_ssl_pfx/config.ts
189+
- x-pack/platform/test/functional_with_es_ssl/apps/cases/group1/config.ts
190+
- x-pack/platform/test/functional_with_es_ssl/apps/cases/group2/config.ts
191+
- x-pack/platform/test/functional_with_es_ssl/apps/cases/basic/config.ts
192+
- x-pack/platform/test/functional_with_es_ssl/apps/discover_ml/config.ts
193+
- x-pack/platform/test/functional_with_es_ssl/apps/embeddable_alerts_table/config.ts
194+
- x-pack/platform/test/functional_with_es_ssl/apps/triggers_actions_ui/config.ts
195+
- x-pack/platform/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors/with_email_aws_ses_kbn_config/config.ts
196+
- x-pack/platform/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors/with_email_services_enabled_kbn_config/config.ts
197+
- x-pack/platform/test/functional_with_es_ssl/apps/triggers_actions_ui/shared/config.ts
198+
- x-pack/platform/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors/webhook_disabled_ssl_pfx/config.ts
198199
- x-pack/test/functional/apps/advanced_settings/config.ts
199-
- x-pack/test/functional/apps/aiops/config.ts
200+
- x-pack/platform/test/functional/apps/aiops/config.ts
200201
- x-pack/test/functional/apps/api_keys/config.ts
201202
- x-pack/platform/test/functional/apps/canvas/config.ts
202203
- x-pack/test/functional/apps/cross_cluster_replication/config.ts
@@ -322,11 +323,11 @@ enabled:
322323
- x-pack/test/security_functional/user_profiles.config.ts
323324
- x-pack/test/security_functional/expired_session.config.ts
324325
- x-pack/test/session_view/basic/config.ts
325-
- x-pack/test/spaces_api_integration/security_and_spaces/config_basic.ts
326-
- x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_basic.ts
327-
- x-pack/test/spaces_api_integration/security_and_spaces/config_trial.ts
328-
- x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.ts
329-
- x-pack/test/spaces_api_integration/spaces_only/config.ts
326+
- x-pack/platform/test/spaces_api_integration/security_and_spaces/config_basic.ts
327+
- x-pack/platform/test/spaces_api_integration/security_and_spaces/copy_to_space_config_basic.ts
328+
- x-pack/platform/test/spaces_api_integration/security_and_spaces/config_trial.ts
329+
- x-pack/platform/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.ts
330+
- x-pack/platform/test/spaces_api_integration/spaces_only/config.ts
330331
- x-pack/platform/test/task_manager_claimer_update_by_query/config.ts
331332
- x-pack/platform/test/ui_capabilities/security_and_spaces/config.ts
332333
- x-pack/platform/test/ui_capabilities/spaces_only/config.ts

‎.eslintrc.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1458,9 +1458,9 @@ module.exports = {
14581458
'packages/kbn-scout/src/playwright/**/*.ts',
14591459
'x-pack/solutions/observability/packages/kbn-scout-oblt/src/playwright/**/*.ts',
14601460
'x-pack/solutions/security/packages/kbn-scout-security/src/playwright/**/*.ts',
1461-
'src/platform/plugins/**/ui_tests/**/*.ts',
1462-
'x-pack/platform/plugins/**/ui_tests/**/*.ts',
1463-
'x-pack/solutions/**/plugins/**/ui_tests/**/*.ts',
1461+
'src/platform/plugins/**/test/scout/**/*.ts',
1462+
'x-pack/platform/plugins/**/test/scout/**/*.ts',
1463+
'x-pack/solutions/**/plugins/**/test/scout/**/*.ts',
14641464
],
14651465
excludedFiles: ['packages/kbn-scout/src/playwright/**/*.test.ts'],
14661466
extends: ['plugin:playwright/recommended'],
@@ -1976,7 +1976,7 @@ module.exports = {
19761976
'x-pack/test/security_functional/**/*.{js,mjs,ts,tsx}',
19771977

19781978
'x-pack/platform/plugins/shared/spaces/**/*.{js,mjs,ts,tsx}',
1979-
'x-pack/test/spaces_api_integration/**/*.{js,mjs,ts,tsx}',
1979+
'x-pack/platform/test/spaces_api_integration/**/*.{js,mjs,ts,tsx}',
19801980
],
19811981
rules: {
19821982
'@typescript-eslint/consistent-type-imports': 1,
@@ -2177,8 +2177,8 @@ module.exports = {
21772177
},
21782178
{
21792179
files: [
2180-
'src/platform/plugins/**/ui_tests/**/*.ts',
2181-
'x-pack/platform/**/plugins/**/ui_tests/**/*.ts',
2180+
'src/platform/plugins/**/test/scout/**/*.ts',
2181+
'x-pack/platform/**/plugins/**/test/scout/**/*.ts',
21822182
],
21832183
rules: {
21842184
'no-restricted-imports': [
@@ -2199,7 +2199,7 @@ module.exports = {
21992199
},
22002200
},
22012201
{
2202-
files: ['x-pack/solutions/observability/plugins/**/ui_tests/**/*.ts'],
2202+
files: ['x-pack/solutions/observability/plugins/**/test/scout/**/*.ts'],
22032203
rules: {
22042204
'no-restricted-imports': [
22052205
'error',
@@ -2226,7 +2226,7 @@ module.exports = {
22262226
},
22272227
},
22282228
{
2229-
files: ['x-pack/solutions/security/plugins/**/ui_tests/**/*.ts'],
2229+
files: ['x-pack/solutions/security/plugins/**/test/scout/**/*.ts'],
22302230
rules: {
22312231
'no-restricted-imports': [
22322232
'error',

0 commit comments

Comments
 (0)