Skip to content

Commit 276e116

Browse files
dmlemeshkokibanamachineafharo
authored andcommitted
[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]>
1 parent 475cf7d commit 276e116

File tree

80 files changed

+160
-323
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

+160
-323
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
@@ -40,11 +40,11 @@ disabled:
4040
- x-pack/platform/test/scalability/config.ts
4141

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

4949
# Default http2 config to use for performance journeys
5050
- x-pack/performance/configs/http2_config.ts
@@ -274,7 +274,7 @@ enabled:
274274
- x-pack/platform/test/functional_cloud/saml.config.ts
275275
- x-pack/platform/test/licensing_plugin/config.public.ts
276276
- x-pack/platform/test/licensing_plugin/config.ts
277-
- x-pack/test/plugin_functional/config.ts
277+
- x-pack/platform/test/plugin_functional/config.ts
278278
- x-pack/platform/test/reporting_api_integration/reporting_and_security.config.ts
279279
- x-pack/platform/test/reporting_api_integration/reporting_without_security.config.ts
280280
- x-pack/platform/test/reporting_functional/reporting_and_security.config.ts

.buildkite/ftr_security_stateful_configs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,3 +134,4 @@ enabled:
134134
- x-pack/solutions/security/test/fleet_api_integration/config.epm.ts
135135
- x-pack/solutions/security/test/fleet_api_integration/config.package_policy.ts
136136
- x-pack/solutions/security/test/functional_solution_sidenav/config.ts
137+
- 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
@@ -773,7 +773,6 @@ module.exports = {
773773
'src/platform/test/*/*.config.ts',
774774
'src/platform/test/*/{tests,test_suites,apis,apps}/**/*',
775775
'src/platform/test/server_integration/**/*.ts',
776-
'x-pack/test/apm_api_integration/**/*.ts',
777776
'x-pack/test/functional/apps/**/*.js',
778777
'x-pack/solutions/observability/plugins/apm/**/*.js',
779778
'x-pack/platform/test/*/{tests,test_suites,apis,apps}/**/*',
@@ -2280,7 +2279,7 @@ module.exports = {
22802279
// Ideally, we need to classify the solution specific ones to reduce CI times
22812280
'x-pack/test_serverless/**',
22822281
'x-pack/test/**',
2283-
'x-pack/test/plugin_functional/plugins/resolver_test/**',
2282+
'x-pack/platform/test/plugin_functional/plugins/resolver_test/**',
22842283
],
22852284
rules: {
22862285
'@kbn/imports/no_group_crossing_manifests': 'warn',

.github/CODEOWNERS

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,6 +1013,7 @@ x-pack/platform/test/plugin_api_integration/plugins/event_log @elastic/response-
10131013
x-pack/platform/test/plugin_api_integration/plugins/feature_usage_test @elastic/kibana-security
10141014
x-pack/platform/test/plugin_api_integration/plugins/sample_task_plugin @elastic/response-ops
10151015
x-pack/platform/test/plugin_api_perf/plugins/task_manager_performance @elastic/response-ops
1016+
x-pack/platform/test/plugin_functional/plugins/global_search_test @elastic/kibana-core
10161017
x-pack/platform/test/saved_object_api_integration/common/plugins/saved_object_test_plugin @elastic/kibana-security
10171018
x-pack/platform/test/security_api_integration/packages/helpers @elastic/kibana-security
10181019
x-pack/platform/test/security_api_integration/plugins/audit_log @elastic/kibana-security
@@ -1133,10 +1134,9 @@ x-pack/solutions/security/plugins/security_solution_ess @elastic/security-soluti
11331134
x-pack/solutions/security/plugins/security_solution_serverless @elastic/security-solution
11341135
x-pack/solutions/security/plugins/session_view @elastic/kibana-cloud-security-posture
11351136
x-pack/solutions/security/test
1137+
x-pack/solutions/security/test/plugin_functional/plugins/resolver_test @elastic/security-solution
11361138
x-pack/test
11371139
x-pack/test_serverless
1138-
x-pack/test/plugin_functional/plugins/global_search_test @elastic/kibana-core
1139-
x-pack/test/plugin_functional/plugins/resolver_test @elastic/security-solution
11401140
####
11411141
## Everything below this line overrides the default assignments for each package.
11421142
## Items lower in the file have higher precedence:
@@ -1529,7 +1529,7 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
15291529
/x-pack/platform/test/fleet_packages @elastic/fleet
15301530
/x-pack/platform/test/fleet_tasks @elastic/fleet
15311531
/src/platform/test/api_integration/apis/custom_integration/*.ts @elastic/fleet
1532-
/x-pack/test/fleet_cypress @elastic/fleet
1532+
/x-pack/platform/test/fleet_cypress @elastic/fleet
15331533
/x-pack/platform/test/fleet_functional @elastic/fleet
15341534
/x-pack/platform/test/fleet_multi_cluster @elastic/fleet
15351535
/src/dev/build/tasks/bundle_fleet_packages.ts @elastic/fleet @elastic/kibana-operations
@@ -1541,7 +1541,7 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
15411541
/src/platform/test/api_integration/apis/ui_metric/*.ts @elastic/obs-ux-infra_services-team
15421542
/x-pack/test/functional/apps/apm/ @elastic/obs-ux-infra_services-team
15431543
/x-pack/solutions/observability/test/api_integration/apm/ @elastic/obs-ux-infra_services-team
1544-
/x-pack/test/apm_cypress/ @elastic/obs-ux-infra_services-team
1544+
/x-pack/solutions/observability/test/apm_cypress/ @elastic/obs-ux-infra_services-team
15451545
/src/apm.js @elastic/kibana-core @vigneshshanmugam
15461546
/src/platform/packages/shared/kbn-utility-types/src/dot.ts @dgieselaar
15471547
/src/platform/packages/shared/kbn-utility-types/src/dot_test.ts @dgieselaar
@@ -1725,7 +1725,7 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
17251725
/src/platform/test/package @elastic/kibana-operations
17261726
/src/platform/test/package/roles @elastic/kibana-operations
17271727
/src/platform/test/common/fixtures/plugins/coverage/kibana.json @elastic/kibana-operations
1728-
/x-pack/test/plugin_functional/screenshots @elastic/kibana-operations # Assigned per https://github.com/elastic/kibana/pull/94370/files
1728+
/x-pack/platform/test/plugin_functional/screenshots @elastic/kibana-operations # Assigned per https://github.com/elastic/kibana/pull/94370/files
17291729
/src/dev/license_checker/config.ts @elastic/kibana-operations
17301730
/src/dev/ @elastic/kibana-operations
17311731
/src/setup_node_env/ @elastic/kibana-operations
@@ -1786,7 +1786,7 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
17861786
/src/platform/test/functional/fixtures/es_archiver/kibana_sample_data_flights* @elastic/appex-qa
17871787
/src/platform/test/functional/fixtures/es_archiver/getting_started/shakespeare @elastic/appex-qa
17881788
/src/platform/test/api_integration/fixtures/es_archiver/elasticsearch @elastic/appex-qa
1789-
/x-pack/test/plugin_functional/services.ts @elastic/appex-qa
1789+
/x-pack/platform/test/plugin_functional/services.ts @elastic/appex-qa
17901790
/src/platform/test/server_integration/services/index.js @elastic/appex-qa
17911791
/x-pack/platform/test/stack_functional_integration/configs/config.stack_functional_integration_base.js @elastic/appex-qa
17921792
/x-pack/platform/test/stack_functional_integration/configs/consume_state.js @elastic/appex-qa
@@ -1795,9 +1795,9 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
17951795
/x-pack/test/kibana.jsonc @elastic/appex-qa
17961796
/x-pack/platform/test/functional_with_es_ssl/ftr_provider_context.d.ts @elastic/appex-qa
17971797
/x-pack/platform/test/stack_functional_integration/apps @elastic/appex-qa
1798-
/x-pack/test/plugin_functional/config.ts @elastic/appex-qa
1799-
/x-pack/test/plugin_functional/ftr_provider_context.d.ts @elastic/appex-qa
1800-
/x-pack/test/plugin_functional/page_objects.ts @elastic/appex-qa
1798+
/x-pack/platform/test/plugin_functional/config.ts @elastic/appex-qa
1799+
/x-pack/platform/test/plugin_functional/ftr_provider_context.d.ts @elastic/appex-qa
1800+
/x-pack/platform/test/plugin_functional/page_objects.ts @elastic/appex-qa
18011801
/x-pack/platform/test/upgrade/services/index.ts @elastic/appex-qa
18021802
/x-pack/platform/test/upgrade/ftr_provider_context.d.ts @elastic/appex-qa
18031803
/x-pack/platform/test/upgrade/config.ts @elastic/appex-qa
@@ -1933,7 +1933,6 @@ x-pack/test/functional/services/index.ts @elastic/appex-qa
19331933
/x-pack/solutions/security/test/api_integration/ftr_provider_context.d.ts @elastic/appex-qa
19341934
/x-pack/solutions/security/test/api_integration/services/index.ts @elastic/appex-qa
19351935
/x-pack/solutions/security/test/alerting_api_integration/ftr_provider_context.d.ts @elastic/appex-qa
1936-
/x-pack/test/apm_api_integration @elastic/appex-qa # temporarily due to SKA tests relocation
19371936
/x-pack/solutions/observability/test/api_integration_deployment_agnostic/feature_flag_configs/serverless/oblt.index.ts @elastic/appex-qa # temporarily due to SKA tests relocation
19381937
/x-pack/solutions/observability/test/api_integration_deployment_agnostic/feature_flag_configs/serverless/oblt.serverless.config.ts @elastic/appex-qa # temporarily due to SKA tests relocation
19391938
/x-pack/solutions/observability/test/api_integration_deployment_agnostic/feature_flag_configs/stateful/oblt.index.ts @elastic/appex-qa # temporarily due to SKA tests relocation
@@ -2383,12 +2382,12 @@ x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/se
23832382
/x-pack/test/functional/es_archives/rule_exceptions @elastic/security-solution # Assigned per https://github.com/elastic/kibana/pull/199795/files/ae80bb252bc71f787c122849fcb9b01e386fc5e9#r1840233040
23842383
/x-pack/solutions/security/test/functional_solution_sidenav/ @elastic/security-solution
23852384
/x-pack/test/common/utils/security_solution/index.ts @elastic/security-solution
2386-
/x-pack/test/plugin_functional/plugins/resolver_test @elastic/security-solution
2385+
/x-pack/solutions/security/test/plugin_functional/ @elastic/security-solution
23872386
/x-pack/test/common/services/security_solution @elastic/security-solution
23882387
/x-pack/test/api_integration/services/security_solution_*.gen.ts @elastic/security-solution
23892388
/x-pack/test/accessibility/apps/group3/security_solution.ts @elastic/security-solution
23902389
/x-pack/test/functional/es_archives/endpoint/ @elastic/security-solution
2391-
/x-pack/test/plugin_functional/test_suites/resolver/ @elastic/security-solution
2390+
/x-pack/platform/test/plugin_functional/test_suites/resolver/ @elastic/security-solution
23922391
/x-pack/test/security_solution_api_integration @elastic/security-solution
23932392
/x-pack/test/api_integration/apis/security_solution @elastic/security-solution
23942393
/x-pack/test/functional/es_archives/auditbeat/default @elastic/security-solution
@@ -2888,7 +2887,7 @@ x-pack/solutions/security/plugins/security_solution/server/lib/security_integrat
28882887
x-pack/platform/plugins/private/translations/translations
28892888

28902889
# Profiling cypress tests
2891-
x-pack/test/profiling_cypress @elastic/obs-ux-infra_services-team
2890+
x-pack/solutions/observability/test/profiling_cypress @elastic/obs-ux-infra_services-team
28922891

28932892
# Profiling api integration testing
28942893
x-pack/solutions/observability/test/api_integration/profiling @elastic/obs-ux-infra_services-team
@@ -2907,7 +2906,7 @@ x-pack/solutions/observability/plugins/observability_shared/public/components/pr
29072906
/src/platform/test/accessibility/apps/home.ts @elastic/appex-sharedux # Assigned per https://github.com/elastic/kibana/pull/199771/files#r1840077237
29082907
/src/platform/test/api_integration/apis/home/*.ts @elastic/appex-sharedux # Assigned per https://github.com/elastic/kibana/pull/199771/files#r1840077065
29092908
/src/platform/test/functional/apps/home @elastic/appex-sharedux # Assigned per https://github.com/elastic/kibana/pull/199771/files#r1840075278
2910-
/x-pack/test/plugin_functional/plugins/global_search_test @elastic/appex-sharedux
2909+
/x-pack/platform/test/plugin_functional/plugins/global_search_test @elastic/appex-sharedux
29112910
/src/platform/test/functional/services/saved_objects_finder.ts @elastic/appex-sharedux
29122911
/src/platform/test/functional/apps/kibana_overview @elastic/appex-sharedux
29132912
/x-pack/platform/test/functional_cloud @elastic/appex-sharedux
@@ -2918,7 +2917,7 @@ x-pack/solutions/observability/plugins/observability_shared/public/components/pr
29182917
/src/platform/test/functional/services/monaco_editor.ts @elastic/appex-sharedux
29192918
/x-pack/test/functional/fixtures/kbn_archiver/global_search @elastic/appex-sharedux
29202919
/src/platform/test/api_integration/fixtures/unused_urls_task @elastic/appex-sharedux
2921-
/x-pack/test/plugin_functional/test_suites/global_search @elastic/appex-sharedux
2920+
/x-pack/platform/test/plugin_functional/test_suites/global_search @elastic/appex-sharedux
29222921
/src/platform/test/plugin_functional/test_suites/shared_ux @elastic/appex-sharedux
29232922
/src/platform/test/plugin_functional/plugins/kbn_sample_panel_action @elastic/appex-sharedux
29242923
/src/platform/test/plugin_functional/plugins/eui_provider_dev_warning @elastic/appex-sharedux

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@
581581
"@kbn/global-search-bar-plugin": "link:x-pack/platform/plugins/private/global_search_bar",
582582
"@kbn/global-search-plugin": "link:x-pack/platform/plugins/shared/global_search",
583583
"@kbn/global-search-providers-plugin": "link:x-pack/platform/plugins/private/global_search_providers",
584-
"@kbn/global-search-test-plugin": "link:x-pack/test/plugin_functional/plugins/global_search_test",
584+
"@kbn/global-search-test-plugin": "link:x-pack/platform/test/plugin_functional/plugins/global_search_test",
585585
"@kbn/graph-plugin": "link:x-pack/platform/plugins/private/graph",
586586
"@kbn/grid-example-plugin": "link:examples/grid_example",
587587
"@kbn/grid-layout": "link:src/platform/packages/private/kbn-grid-layout",
@@ -805,7 +805,7 @@
805805
"@kbn/reporting-server": "link:src/platform/packages/private/kbn-reporting/server",
806806
"@kbn/resizable-layout": "link:src/platform/packages/shared/kbn-resizable-layout",
807807
"@kbn/resizable-layout-examples-plugin": "link:examples/resizable_layout_examples",
808-
"@kbn/resolver-test-plugin": "link:x-pack/test/plugin_functional/plugins/resolver_test",
808+
"@kbn/resolver-test-plugin": "link:x-pack/solutions/security/test/plugin_functional/plugins/resolver_test",
809809
"@kbn/response-ops-alerts-apis": "link:src/platform/packages/shared/response-ops/alerts-apis",
810810
"@kbn/response-ops-alerts-delete": "link:src/platform/packages/shared/response-ops/alerts-delete",
811811
"@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
@@ -63,7 +63,7 @@ export const INTERNAL_PLUGIN_LOCATIONS: Array<{ name: string; value: string }> =
6363
})),
6464
{
6565
name: 'X-Pack Functional Testing',
66-
value: Path.resolve(REPO_ROOT, 'x-pack/test/plugin_functional/plugins'),
66+
value: Path.resolve(REPO_ROOT, 'x-pack/platform/test/plugin_functional/plugins'),
6767
},
6868
];
6969

0 commit comments

Comments
 (0)