Skip to content

Commit 6eb8436

Browse files
committed
[ska] relocate cypress & plugin functional tests (elastic#228681)
## Summary Part of elastic/kibana-team#1503 This PR is mostly about moving FTR and Cypress runner/tests from x-pack/test ``` x-pack/test/ | - apm_cypress/ | - profiling_cypress/ | - fleet_cypress/ | - plugin_functional/ ``` After: ``` x-pack/test/ | - plugin_functional/ x-pack/solutions/observability/test/ | - apm_cypress/ | - profiling_cypress/ | - fleet_cypress/ x-pack/solutions/security/test/ | - plugin_functional ``` --------- Co-authored-by: kibanamachine <[email protected]> Co-authored-by: Alejandro Fernández Haro <[email protected]> (cherry picked from commit 16417b6) # Conflicts: # .buildkite/ftr_security_stateful_configs.yml # .github/CODEOWNERS # x-pack/solutions/observability/test/apm_cypress/runner.ts # x-pack/test/tsconfig.json
1 parent 59dfa8f commit 6eb8436

File tree

80 files changed

+194
-354
lines changed

Some content is hidden

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

80 files changed

+194
-354
lines changed

.buildkite/ftr_oblt_stateful_configs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
disabled:
22
# Cypress configs, for now these are still run manually
3-
- x-pack/test/apm_cypress/cli_config.ts
3+
- x-pack/solutions/observability/test/apm_cypress/cli_config.ts
44
- x-pack/solutions/observability/plugins/observability_onboarding/e2e/ftr_config_open.ts
55
- x-pack/solutions/observability/plugins/observability_onboarding/e2e/ftr_config_runner.ts
66
- x-pack/solutions/observability/plugins/observability_onboarding/e2e/ftr_config.ts
77
- x-pack/solutions/observability/plugins/inventory/e2e/ftr_config_run.ts
88
- x-pack/solutions/observability/plugins/inventory/e2e/ftr_config.ts
9-
- x-pack/test/profiling_cypress/cli_config.ts
9+
- x-pack/solutions/observability/test/profiling_cypress/cli_config.ts
1010
#FTR configs
1111
- x-pack/solutions/observability/plugins/uptime/e2e/config.ts
1212
- x-pack/solutions/observability/test/api_integration/config.ts

.buildkite/ftr_platform_stateful_configs.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ disabled:
3939
- x-pack/platform/test/scalability/config.ts
4040

4141
# Cypress configs, for now these are still run manually
42-
- x-pack/test/fleet_cypress/cli_config.ts
43-
- x-pack/test/fleet_cypress/cli_config.space_awareness.ts
44-
- x-pack/test/fleet_cypress/config.ts
45-
- x-pack/test/fleet_cypress/config.space_awareness.ts
46-
- x-pack/test/fleet_cypress/visual_config.ts
42+
- x-pack/platform/test/fleet_cypress/cli_config.ts
43+
- x-pack/platform/test/fleet_cypress/cli_config.space_awareness.ts
44+
- x-pack/platform/test/fleet_cypress/config.ts
45+
- x-pack/platform/test/fleet_cypress/config.space_awareness.ts
46+
- x-pack/platform/test/fleet_cypress/visual_config.ts
4747

4848
# Default http2 config to use for performance journeys
4949
- x-pack/performance/configs/http2_config.ts
@@ -266,7 +266,7 @@ enabled:
266266
- x-pack/test/kubernetes_security/basic/config.ts
267267
- x-pack/platform/test/licensing_plugin/config.public.ts
268268
- x-pack/platform/test/licensing_plugin/config.ts
269-
- x-pack/test/plugin_functional/config.ts
269+
- x-pack/platform/test/plugin_functional/config.ts
270270
- x-pack/platform/test/reporting_api_integration/reporting_and_security.config.ts
271271
- x-pack/platform/test/reporting_api_integration/reporting_without_security.config.ts
272272
- x-pack/platform/test/reporting_functional/reporting_and_deprecated_security.config.ts

.buildkite/ftr_security_stateful_configs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,4 @@ enabled:
129129
- x-pack/solutions/security/test/fleet_api_integration/config.package_policy.ts
130130
- x-pack/solutions/security/test/functional_solution_sidenav/config.ts
131131
- x-pack/solutions/security/test/session_view/basic/config.ts
132+
- x-pack/solutions/security/test/plugin_functional/config.ts

.eslintrc.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,6 @@ module.exports = {
646646
'src/platform/test/*/*.config.ts',
647647
'src/platform/test/*/{tests,test_suites,apis,apps}/**/*',
648648
'src/platform/test/server_integration/**/*.ts',
649-
'x-pack/test/apm_api_integration/**/*.ts',
650649
'x-pack/test/functional/apps/**/*.js',
651650
'x-pack/solutions/observability/plugins/apm/**/*.js',
652651
'x-pack/platform/test/*/{tests,test_suites,apis,apps}/**/*',
@@ -2196,7 +2195,7 @@ module.exports = {
21962195
// Ideally, we need to classify the solution specific ones to reduce CI times
21972196
'x-pack/test_serverless/**',
21982197
'x-pack/test/**',
2199-
'x-pack/test/plugin_functional/plugins/resolver_test/**',
2198+
'x-pack/platform/test/plugin_functional/plugins/resolver_test/**',
22002199
],
22012200
rules: {
22022201
'@kbn/imports/no_group_crossing_manifests': 'warn',

.github/CODEOWNERS

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1422,9 +1422,9 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
14221422
/x-pack/solutions/security/test/fleet_api_integration @elastic/fleet
14231423
/x-pack/platform/test/fleet_api_integration @elastic/fleet
14241424
/x-pack/platform/test/fleet_packages @elastic/fleet
1425-
^/src/platform/test/api_integration/apis/custom_integration/*.ts @elastic/fleet
1426-
/x-pack/test/fleet_cypress @elastic/fleet
1427-
/x-pack/test/fleet_functional @elastic/fleet
1425+
/src/platform/test/api_integration/apis/custom_integration/*.ts @elastic/fleet
1426+
/x-pack/platform/test/fleet_cypress @elastic/fleet
1427+
/x-pack/platform/test/fleet_functional @elastic/fleet
14281428
/src/dev/build/tasks/bundle_fleet_packages.ts @elastic/fleet @elastic/kibana-operations
14291429
/x-pack/platform/plugins/shared/fleet/server/services/elastic_agent_manifest.ts @elastic/fleet @elastic/obs-cloudnative-monitoring
14301430
/x-pack/test_serverless/**/test_suites/**/fleet/ @elastic/fleet
@@ -1436,7 +1436,7 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
14361436
^/src/platform/test/api_integration/apis/ui_metric/*.ts @elastic/obs-ux-infra_services-team
14371437
/x-pack/test/functional/apps/apm/ @elastic/obs-ux-infra_services-team
14381438
/x-pack/solutions/observability/test/api_integration/apm/ @elastic/obs-ux-infra_services-team
1439-
/x-pack/test/apm_cypress/ @elastic/obs-ux-infra_services-team
1439+
/x-pack/solutions/observability/test/apm_cypress/ @elastic/obs-ux-infra_services-team
14401440
/src/apm.js @elastic/kibana-core @vigneshshanmugam
14411441
/src/platform/packages/shared/kbn-utility-types/src/dot.ts @dgieselaar
14421442
/src/platform/packages/shared/kbn-utility-types/src/dot_test.ts @dgieselaar
@@ -1617,10 +1617,10 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
16171617
/x-pack/platform/test/functional_basic/apps/transform/ @elastic/ml-ui @elastic/kibana-management
16181618

16191619
# Operations
1620-
^/src/platform/test/package @elastic/kibana-operations
1621-
^/src/platform/test/package/roles @elastic/kibana-operations
1622-
^/src/platform/test/common/fixtures/plugins/coverage/kibana.json @elastic/kibana-operations
1623-
/x-pack/test/plugin_functional/screenshots @elastic/kibana-operations # Assigned per https://github.com/elastic/kibana/pull/94370/files
1620+
/src/platform/test/package @elastic/kibana-operations
1621+
/src/platform/test/package/roles @elastic/kibana-operations
1622+
/src/platform/test/common/fixtures/plugins/coverage/kibana.json @elastic/kibana-operations
1623+
/x-pack/platform/test/plugin_functional/screenshots @elastic/kibana-operations # Assigned per https://github.com/elastic/kibana/pull/94370/files
16241624
/src/dev/license_checker/config.ts @elastic/kibana-operations
16251625
/src/dev/ @elastic/kibana-operations
16261626
/src/setup_node_env/ @elastic/kibana-operations
@@ -1667,32 +1667,32 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
16671667
/x-pack/test/functional/es_archives/event_log_legacy_ids @elastic/appex-qa
16681668
/x-pack/test/functional/es_archives/dlstest @elastic/appex-qa # No usages found
16691669
/x-pack/test/functional/es_archives/beats/list/data.json @elastic/appex-qa # No usages found
1670-
^/src/platform/test/functional/fixtures/kbn_archiver/stress_test.json @elastic/appex-qa
1671-
^/src/platform/test/functional/fixtures/kbn_archiver/many_fields_data_view.json @elastic/appex-qa
1672-
^/src/platform/test/functional/fixtures/kbn_archiver/long_window_logstash_index_pattern.json @elastic/appex-qa
1673-
^/src/platform/test/functional/fixtures/kbn_archiver/kibana_sample_data_logs_tsdb.json @elastic/appex-qa
1674-
^/src/platform/test/functional/fixtures/kbn_archiver/kibana_sample_data_logs_logsdb.json @elastic/appex-qa
1675-
^/src/platform/test/functional/fixtures/kbn_archiver/kibana_sample_data_flights_index_pattern.json @elastic/appex-qa
1676-
^/src/platform/test/functional/fixtures/es_archiver/stress_test @elastic/appex-qa
1677-
^/src/platform/test/functional/fixtures/es_archiver/many_fields @elastic/appex-qa
1678-
^/src/platform/test/functional/fixtures/es_archiver/logstash_functional @elastic/appex-qa
1679-
^/src/platform/test/functional/fixtures/es_archiver/long_window_logstash @elastic/appex-qa
1680-
^/src/platform/test/functional/fixtures/es_archiver/kibana_sample_data_logs_* @elastic/appex-qa
1681-
^/src/platform/test/functional/fixtures/es_archiver/kibana_sample_data_flights* @elastic/appex-qa
1682-
^/src/platform/test/functional/fixtures/es_archiver/getting_started/shakespeare @elastic/appex-qa
1683-
^/src/platform/test/api_integration/fixtures/es_archiver/elasticsearch @elastic/appex-qa
1684-
/x-pack/test/plugin_functional/services.ts @elastic/appex-qa
1685-
^/src/platform/test/server_integration/services/index.js @elastic/appex-qa
1686-
/x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js @elastic/appex-qa
1687-
/x-pack/test/stack_functional_integration/configs/consume_state.js @elastic/appex-qa
1688-
/x-pack/test/functional/services/remote_es/remote_es_archiver.ts @elastic/appex-qa
1689-
^/src/platform/test/functional/services/remote_es/remote_es_archiver.ts @elastic/appex-qa
1670+
/src/platform/test/functional/fixtures/kbn_archiver/stress_test.json @elastic/appex-qa
1671+
/src/platform/test/functional/fixtures/kbn_archiver/many_fields_data_view.json @elastic/appex-qa
1672+
/src/platform/test/functional/fixtures/kbn_archiver/long_window_logstash_index_pattern.json @elastic/appex-qa
1673+
/src/platform/test/functional/fixtures/kbn_archiver/kibana_sample_data_logs_tsdb.json @elastic/appex-qa
1674+
/src/platform/test/functional/fixtures/kbn_archiver/kibana_sample_data_logs_logsdb.json @elastic/appex-qa
1675+
/src/platform/test/functional/fixtures/kbn_archiver/kibana_sample_data_flights_index_pattern.json @elastic/appex-qa
1676+
/src/platform/test/functional/fixtures/es_archiver/stress_test @elastic/appex-qa
1677+
/src/platform/test/functional/fixtures/es_archiver/many_fields @elastic/appex-qa
1678+
/src/platform/test/functional/fixtures/es_archiver/logstash_functional @elastic/appex-qa
1679+
/src/platform/test/functional/fixtures/es_archiver/long_window_logstash @elastic/appex-qa
1680+
/src/platform/test/functional/fixtures/es_archiver/kibana_sample_data_logs_* @elastic/appex-qa
1681+
/src/platform/test/functional/fixtures/es_archiver/kibana_sample_data_flights* @elastic/appex-qa
1682+
/src/platform/test/functional/fixtures/es_archiver/getting_started/shakespeare @elastic/appex-qa
1683+
/src/platform/test/api_integration/fixtures/es_archiver/elasticsearch @elastic/appex-qa
1684+
/x-pack/platform/test/plugin_functional/services.ts @elastic/appex-qa
1685+
/src/platform/test/server_integration/services/index.js @elastic/appex-qa
1686+
/x-pack/platform/test/stack_functional_integration/configs/config.stack_functional_integration_base.js @elastic/appex-qa
1687+
/x-pack/platform/test/stack_functional_integration/configs/consume_state.js @elastic/appex-qa
1688+
/x-pack/platform/test/functional/services/remote_es/remote_es_archiver.ts @elastic/appex-qa
1689+
/src/platform/test/functional/services/remote_es/remote_es_archiver.ts @elastic/appex-qa
16901690
/x-pack/test/kibana.jsonc @elastic/appex-qa
16911691
/x-pack/platform/test/functional_with_es_ssl/ftr_provider_context.d.ts @elastic/appex-qa
1692-
/x-pack/test/stack_functional_integration/apps @elastic/appex-qa
1693-
/x-pack/test/plugin_functional/config.ts @elastic/appex-qa
1694-
/x-pack/test/plugin_functional/ftr_provider_context.d.ts @elastic/appex-qa
1695-
/x-pack/test/plugin_functional/page_objects.ts @elastic/appex-qa
1692+
/x-pack/platform/test/stack_functional_integration/apps @elastic/appex-qa
1693+
/x-pack/platform/test/plugin_functional/config.ts @elastic/appex-qa
1694+
/x-pack/platform/test/plugin_functional/ftr_provider_context.d.ts @elastic/appex-qa
1695+
/x-pack/platform/test/plugin_functional/page_objects.ts @elastic/appex-qa
16961696
/x-pack/platform/test/upgrade/services/index.ts @elastic/appex-qa
16971697
/x-pack/platform/test/upgrade/ftr_provider_context.d.ts @elastic/appex-qa
16981698
/x-pack/platform/test/upgrade/config.ts @elastic/appex-qa
@@ -2270,12 +2270,12 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/confi
22702270
/x-pack/test/functional/es_archives/rule_exceptions @elastic/security-solution # Assigned per https://github.com/elastic/kibana/pull/199795/files/ae80bb252bc71f787c122849fcb9b01e386fc5e9#r1840233040
22712271
/x-pack/solutions/security/test/functional_solution_sidenav/ @elastic/security-solution
22722272
/x-pack/test/common/utils/security_solution/index.ts @elastic/security-solution
2273-
/x-pack/test/plugin_functional/plugins/resolver_test @elastic/security-solution
2273+
/x-pack/solutions/security/test/plugin_functional/ @elastic/security-solution
22742274
/x-pack/test/common/services/security_solution @elastic/security-solution
22752275
/x-pack/test/api_integration/services/security_solution_*.gen.ts @elastic/security-solution
22762276
/x-pack/test/accessibility/apps/group3/security_solution.ts @elastic/security-solution
22772277
/x-pack/test/functional/es_archives/endpoint/ @elastic/security-solution
2278-
/x-pack/test/plugin_functional/test_suites/resolver/ @elastic/security-solution
2278+
/x-pack/platform/test/plugin_functional/test_suites/resolver/ @elastic/security-solution
22792279
/x-pack/test/security_solution_api_integration @elastic/security-solution
22802280
/x-pack/test/api_integration/apis/security_solution @elastic/security-solution
22812281
/x-pack/test/functional/es_archives/auditbeat/default @elastic/security-solution
@@ -2760,7 +2760,7 @@ x-pack/solutions/security/plugins/security_solution/server/lib/security_integrat
27602760
x-pack/platform/plugins/private/translations/translations
27612761

27622762
# Profiling cypress tests
2763-
x-pack/test/profiling_cypress @elastic/obs-ux-infra_services-team
2763+
x-pack/solutions/observability/test/profiling_cypress @elastic/obs-ux-infra_services-team
27642764

27652765
# Profiling api integration testing
27662766
x-pack/solutions/observability/test/api_integration/profiling @elastic/obs-ux-infra_services-team
@@ -2779,7 +2779,7 @@ x-pack/solutions/observability/plugins/observability_shared/public/components/pr
27792779
/src/platform/test/accessibility/apps/home.ts @elastic/appex-sharedux # Assigned per https://github.com/elastic/kibana/pull/199771/files#r1840077237
27802780
/src/platform/test/api_integration/apis/home/*.ts @elastic/appex-sharedux # Assigned per https://github.com/elastic/kibana/pull/199771/files#r1840077065
27812781
/src/platform/test/functional/apps/home @elastic/appex-sharedux # Assigned per https://github.com/elastic/kibana/pull/199771/files#r1840075278
2782-
/x-pack/test/plugin_functional/plugins/global_search_test @elastic/appex-sharedux
2782+
/x-pack/platform/test/plugin_functional/plugins/global_search_test @elastic/appex-sharedux
27832783
/src/platform/test/functional/services/saved_objects_finder.ts @elastic/appex-sharedux
27842784
/src/platform/test/functional/apps/kibana_overview @elastic/appex-sharedux
27852785
/x-pack/test/functional_solution_sidenav/config.ts @elastic/appex-sharedux
@@ -2796,18 +2796,18 @@ x-pack/solutions/observability/plugins/observability_shared/public/components/pr
27962796
^/src/platform/test/functional/services/monaco_editor.ts @elastic/appex-sharedux
27972797
/x-pack/test/functional/fixtures/kbn_archiver/global_search @elastic/appex-sharedux
27982798
/src/platform/test/api_integration/fixtures/unused_urls_task @elastic/appex-sharedux
2799-
/x-pack/test/plugin_functional/test_suites/global_search @elastic/appex-sharedux
2800-
^/src/platform/test/plugin_functional/test_suites/shared_ux @elastic/appex-sharedux
2801-
^/src/platform/test/plugin_functional/plugins/kbn_sample_panel_action @elastic/appex-sharedux
2802-
^/src/platform/test/plugin_functional/plugins/eui_provider_dev_warning @elastic/appex-sharedux
2803-
^/src/platform/test/functional/page_objects/settings_page.ts @elastic/appex-sharedux
2804-
^/src/platform/test/functional/apps/sharing/*.ts @elastic/appex-sharedux
2805-
^/src/platform/test/functional/apps/kibana_overviews @elastic/appex-sharedux
2806-
^/src/platform/test/examples/ui_actions/*.ts @elastic/appex-sharedux
2807-
^/src/platform/test/examples/state_sync/*.ts @elastic/appex-sharedux
2808-
^/src/platform/test/examples/error_boundary/index.ts @elastic/appex-sharedux
2809-
^/src/platform/test/examples/content_management/*.ts @elastic/appex-sharedux
2810-
^/src/platform/test/api_integration/apis/guided_onboarding @elastic/appex-sharedux
2799+
/x-pack/platform/test/plugin_functional/test_suites/global_search @elastic/appex-sharedux
2800+
/src/platform/test/plugin_functional/test_suites/shared_ux @elastic/appex-sharedux
2801+
/src/platform/test/plugin_functional/plugins/kbn_sample_panel_action @elastic/appex-sharedux
2802+
/src/platform/test/plugin_functional/plugins/eui_provider_dev_warning @elastic/appex-sharedux
2803+
/src/platform/test/functional/page_objects/settings_page.ts @elastic/appex-sharedux
2804+
/src/platform/test/functional/apps/sharing/*.ts @elastic/appex-sharedux
2805+
/src/platform/test/functional/apps/kibana_overviews @elastic/appex-sharedux
2806+
/src/platform/test/examples/ui_actions/*.ts @elastic/appex-sharedux
2807+
/src/platform/test/examples/state_sync/*.ts @elastic/appex-sharedux
2808+
/src/platform/test/examples/error_boundary/index.ts @elastic/appex-sharedux
2809+
/src/platform/test/examples/content_management/*.ts @elastic/appex-sharedux
2810+
/src/platform/test/api_integration/apis/guided_onboarding @elastic/appex-sharedux
28112811
/x-pack/solutions/search/test/api_integration/apis/guided_onboarding @elastic/appex-sharedux
28122812
/x-pack/platform/test/banners_functional @elastic/appex-sharedux
28132813
/x-pack/platform/test/custom_branding @elastic/appex-sharedux

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@
570570
"@kbn/global-search-bar-plugin": "link:x-pack/platform/plugins/private/global_search_bar",
571571
"@kbn/global-search-plugin": "link:x-pack/platform/plugins/shared/global_search",
572572
"@kbn/global-search-providers-plugin": "link:x-pack/platform/plugins/private/global_search_providers",
573-
"@kbn/global-search-test-plugin": "link:x-pack/test/plugin_functional/plugins/global_search_test",
573+
"@kbn/global-search-test-plugin": "link:x-pack/platform/test/plugin_functional/plugins/global_search_test",
574574
"@kbn/graph-plugin": "link:x-pack/platform/plugins/private/graph",
575575
"@kbn/grid-example-plugin": "link:examples/grid_example",
576576
"@kbn/grid-layout": "link:src/platform/packages/private/kbn-grid-layout",
@@ -787,7 +787,7 @@
787787
"@kbn/reporting-server": "link:src/platform/packages/private/kbn-reporting/server",
788788
"@kbn/resizable-layout": "link:src/platform/packages/shared/kbn-resizable-layout",
789789
"@kbn/resizable-layout-examples-plugin": "link:examples/resizable_layout_examples",
790-
"@kbn/resolver-test-plugin": "link:x-pack/test/plugin_functional/plugins/resolver_test",
790+
"@kbn/resolver-test-plugin": "link:x-pack/solutions/security/test/plugin_functional/plugins/resolver_test",
791791
"@kbn/response-ops-alerts-apis": "link:src/platform/packages/shared/response-ops/alerts-apis",
792792
"@kbn/response-ops-alerts-delete": "link:src/platform/packages/shared/response-ops/alerts-delete",
793793
"@kbn/response-ops-alerts-fields-browser": "link:src/platform/packages/shared/response-ops/alerts-fields-browser",

packages/kbn-babel-preset/styled_components_files.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/kbn-plugin-generator/src/ask_questions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export const INTERNAL_PLUGIN_LOCATIONS: Array<{ name: string; value: string }> =
7070
},
7171
{
7272
name: 'X-Pack Functional Testing',
73-
value: Path.resolve(REPO_ROOT, 'x-pack/test/plugin_functional/plugins'),
73+
value: Path.resolve(REPO_ROOT, 'x-pack/platform/test/plugin_functional/plugins'),
7474
},
7575
];
7676

0 commit comments

Comments
 (0)