Skip to content

Commit 2961e8c

Browse files
[ska] relocate upgrade, usage_collection, search_sessions_integration and licensing tests (#226669)
## Summary Part of elastic/kibana-team#1503 This PR is mostly about moving platform tests from x-pack/test ``` x-pack/test/ | - licensing_plugin/ | - search_sessions_integration/ | - upgrade/ | - usage_collection/ ``` After: ``` x-pack/platform/test/ | - licensing_plugin/ | - search_sessions_integration/ | - upgrade/ | - usage_collection/ ``` --------- Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
1 parent dea586e commit 2961e8c

File tree

85 files changed

+59
-52
lines changed

Some content is hidden

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

85 files changed

+59
-52
lines changed

.buildkite/ftr_platform_stateful_configs.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -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
@@ -409,4 +410,3 @@ enabled:
409410
- x-pack/platform/test/saved_object_api_integration/spaces_only/config.ts
410411
- x-pack/platform/test/saved_object_api_integration/low-level/config.ts
411412
- x-pack/platform/test/saved_object_api_integration/user_profiles/config.ts
412-
- src/platform/test/api_integration/apis/unused_urls_task/config.ts

.github/CODEOWNERS

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -995,6 +995,7 @@ x-pack/platform/test/encrypted_saved_objects_api_integration/plugins/api_consume
995995
x-pack/platform/test/functional_cors/plugins/kibana_cors_test @elastic/kibana-security
996996
x-pack/platform/test/functional_embedded/plugins/iframe_embedded @elastic/kibana-core
997997
x-pack/platform/test/functional_execution_context/plugins/alerts @elastic/kibana-core
998+
x-pack/platform/test/licensing_plugin/plugins/test_feature_usage @elastic/kibana-security
998999
x-pack/platform/test/plugin_api_integration/plugins/elasticsearch_client @elastic/kibana-core
9991000
x-pack/platform/test/plugin_api_integration/plugins/event_log @elastic/response-ops
10001001
x-pack/platform/test/plugin_api_integration/plugins/feature_usage_test @elastic/kibana-security
@@ -1004,6 +1005,8 @@ x-pack/platform/test/saved_object_api_integration/common/plugins/saved_object_te
10041005
x-pack/platform/test/spaces_api_integration/common/plugins/spaces_test_plugin @elastic/kibana-security
10051006
x-pack/platform/test/task_manager_claimer_update_by_query/plugins/sample_task_plugin_mget @elastic/response-ops
10061007
x-pack/platform/test/ui_capabilities/common/plugins/foo_plugin @elastic/kibana-security
1008+
x-pack/platform/test/usage_collection/plugins/application_usage_test @elastic/kibana-core
1009+
x-pack/platform/test/usage_collection/plugins/stack_management_usage_test @elastic/kibana-management
10071010
x-pack/solutions/chat/packages/wc-framework-types-browser @elastic/search-kibana @elastic/workchat-eng
10081011
x-pack/solutions/chat/packages/wc-framework-types-common @elastic/search-kibana @elastic/workchat-eng
10091012
x-pack/solutions/chat/packages/wc-framework-types-server @elastic/search-kibana @elastic/workchat-eng
@@ -1117,7 +1120,6 @@ x-pack/test_serverless
11171120
x-pack/test/cloud_integration/plugins/saml_provider @elastic/kibana-core
11181121
x-pack/test/functional_with_es_ssl/plugins/alerts @elastic/response-ops
11191122
x-pack/test/functional_with_es_ssl/plugins/cases @elastic/response-ops
1120-
x-pack/test/licensing_plugin/plugins/test_feature_usage @elastic/kibana-security
11211123
x-pack/test/plugin_functional/plugins/global_search_test @elastic/kibana-core
11221124
x-pack/test/plugin_functional/plugins/resolver_test @elastic/security-solution
11231125
x-pack/test/security_api_integration/packages/helpers @elastic/kibana-security
@@ -1127,8 +1129,6 @@ x-pack/test/security_api_integration/plugins/oidc_provider @elastic/kibana-secur
11271129
x-pack/test/security_api_integration/plugins/saml_provider @elastic/kibana-security
11281130
x-pack/test/security_api_integration/plugins/user_profiles_consumer @elastic/kibana-security
11291131
x-pack/test/security_functional/plugins/test_endpoints @elastic/kibana-security
1130-
x-pack/test/usage_collection/plugins/application_usage_test @elastic/kibana-core
1131-
x-pack/test/usage_collection/plugins/stack_management_usage_test @elastic/kibana-management
11321132
####
11331133
## Everything below this line overrides the default assignments for each package.
11341134
## Items lower in the file have higher precedence:
@@ -1211,10 +1211,10 @@ x-pack/test_serverless/api_integration/test_suites/common/platform_security @ela
12111211
/x-pack/test/functional/apps/discover @elastic/kibana-data-discovery
12121212
/x-pack/platform/test/functional/apps/saved_query_management @elastic/kibana-data-discovery
12131213
/x-pack/test/functional_with_es_ssl/apps/discover_ml_uptime/discover @elastic/kibana-data-discovery
1214-
/x-pack/test/search_sessions_integration @elastic/kibana-data-discovery
1214+
/x-pack/platform/test/search_sessions_integration @elastic/kibana-data-discovery
12151215
/x-pack/test/stack_functional_integration/apps/ccs/ccs_discover.js @elastic/kibana-data-discovery
12161216
/x-pack/test/stack_functional_integration/apps/management/_index_pattern_create.js @elastic/kibana-data-discovery
1217-
/x-pack/test/upgrade/apps/discover @elastic/kibana-data-discovery
1217+
/x-pack/platform/test/upgrade/apps/discover @elastic/kibana-data-discovery
12181218
/x-pack/test_serverless/api_integration/test_suites/common/data_views @elastic/kibana-data-discovery
12191219
/x-pack/test_serverless/api_integration/test_suites/common/data_view_field_editor @elastic/kibana-data-discovery
12201220
/x-pack/test_serverless/api_integration/test_suites/common/kql_telemetry @elastic/kibana-data-discovery
@@ -1258,9 +1258,9 @@ src/platform/plugins/shared/discover/public/context_awareness/profile_providers/
12581258
/src/platform/test/functional/fixtures/kbn_archiver/managed_content.json @elastic/kibana-visualizations # Assigned per only use: https://github.com/elastic/kibana/blob/main/x-pack/test/functional/apps/managed_content/managed_content.ts#L38
12591259
/src/platform/test/api_integration/fixtures/kbn_archiver/event_annotations/event_annotations.json @elastic/kibana-visualizations
12601260
/src/platform/test/functional/apps/getting_started/*.ts @elastic/kibana-visualizations # Assigned per https://github.com/elastic/kibana/pull/199767#discussion_r1840485031
1261-
/x-pack/test/upgrade/apps/graph @elastic/kibana-visualizations
1261+
/x-pack/platform/test/upgrade/apps/graph @elastic/kibana-visualizations
12621262
/x-pack/platform/test/functional/page_objects/log_wrapper.ts @elastic/kibana-visualizations # Assigned per https://github.com/elastic/kibana/pull/36437
1263-
/x-pack/test/functional/page_objects/graph_page.ts @elastic/kibana-visualizations
1263+
/x-pack/platform/test/functional/page_objects/graph_page.ts @elastic/kibana-visualizations
12641264
/x-pack/test/functional/apps/managed_content @elastic/kibana-visualizations
12651265
/src/platform/test/functional/services/visualizations @elastic/kibana-visualizations
12661266
/src/platform/test/functional/services/renderable.ts @elastic/kibana-visualizations
@@ -1321,7 +1321,7 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
13211321
/x-pack/test_serverless/**/test_suites/common/reporting/ @elastic/response-ops
13221322
/x-pack/test/accessibility/apps/group3/reporting.ts @elastic/response-ops
13231323
/x-pack/platform/test/functional/page_objects/reporting_page.ts @elastic/response-ops
1324-
/x-pack/test/upgrade/apps/reporting @elastic/response-ops
1324+
/x-pack/platform/test/upgrade/apps/reporting @elastic/response-ops
13251325
/x-pack/test_serverless/functional/fixtures/kbn_archiver/reporting @elastic/response-ops
13261326

13271327
### Global Experience Tagging
@@ -1583,7 +1583,7 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
15831583
/src/platform/test/functional/page_objects/unified_search_page.ts @elastic/kibana-presentation
15841584
/src/platform/test/functional/fixtures/kbn_archiver/dashboard_error_cases.json @elastic/kibana-presentation # Assigned per https://github.com/elastic/kibana/pull/201648#discussion_r1859020986
15851585
/x-pack/test/functional/es_archives/getting_started/shakespeare @elastic/kibana-presentation # Assigned per https://github.com/elastic/kibana/pull/201648#discussion_r1860319853
1586-
/x-pack/test/upgrade/screenshots @elastic/kibana-presentation
1586+
/x-pack/platform/test/upgrade/screenshots @elastic/kibana-presentation
15871587
/x-pack/test/functional/screenshots @elastic/kibana-presentation
15881588
/src/platform/test/functional/fixtures/kbn_archiver/legacy.json @elastic/kibana-presentation # Assigned per https://github.com/elastic/kibana/pull/200934#discussion_r1856407606
15891589
/x-pack/test/functional/fixtures/kbn_archiver/maps.json @elastic/kibana-presentation
@@ -1597,8 +1597,8 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
15971597
/x-pack/test/functional/services/canvas_element.ts @elastic/kibana-presentation
15981598
/x-pack/platform/test/functional/page_objects/canvas_page.ts @elastic/kibana-presentation
15991599
/x-pack/test/accessibility/apps/group3/canvas.ts @elastic/kibana-presentation
1600-
/x-pack/test/upgrade/apps/canvas @elastic/kibana-presentation
1601-
/x-pack/test/upgrade/apps/dashboard @elastic/kibana-presentation
1600+
/x-pack/platform/test/upgrade/apps/canvas @elastic/kibana-presentation
1601+
/x-pack/platform/test/upgrade/apps/dashboard @elastic/kibana-presentation
16021602
/src/platform/test/functional/screenshots/baseline/tsvb_dashboard.png @elastic/kibana-presentation
16031603
/src/platform/test/functional/screenshots/baseline/dashboard_*.png @elastic/kibana-presentation
16041604
/src/platform/test/functional/screenshots/baseline/area_chart.png @elastic/kibana-presentation
@@ -1622,11 +1622,11 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
16221622
/src/platform/test/plugin_functional/test_suites/panel_actions @elastic/kibana-presentation
16231623
/x-pack/test/functional/es_archives/canvas/logstash_lens @elastic/kibana-presentation
16241624
#CC# /src/plugins/kibana_react/public/code_editor/ @elastic/kibana-presentation
1625-
/x-pack/test/upgrade/services/maps_upgrade_services.ts @elastic/kibana-presentation
1625+
/x-pack/platform/test/upgrade/services/maps_upgrade_services.ts @elastic/kibana-presentation
16261626
/x-pack/test/stack_functional_integration/apps/maps @elastic/kibana-presentation
16271627
/x-pack/test/functional/page_objects/geo_file_upload.ts @elastic/kibana-presentation
16281628
/x-pack/platform/test/functional/page_objects/gis_page.ts @elastic/kibana-presentation
1629-
/x-pack/test/upgrade/apps/maps @elastic/kibana-presentation
1629+
/x-pack/platform/test/upgrade/apps/maps @elastic/kibana-presentation
16301630
/x-pack/platform/test/api_integration/apis/maps/ @elastic/kibana-presentation
16311631
/x-pack/test/functional/apps/maps/ @elastic/kibana-presentation
16321632
/x-pack/test/functional/es_archives/maps/ @elastic/kibana-presentation
@@ -1753,9 +1753,9 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
17531753
/x-pack/test/plugin_functional/config.ts @elastic/appex-qa
17541754
/x-pack/test/plugin_functional/ftr_provider_context.d.ts @elastic/appex-qa
17551755
/x-pack/test/plugin_functional/page_objects.ts @elastic/appex-qa
1756-
/x-pack/test/upgrade/services/index.ts @elastic/appex-qa
1757-
/x-pack/test/upgrade/ftr_provider_context.d.ts @elastic/appex-qa
1758-
/x-pack/test/upgrade/config.ts @elastic/appex-qa
1756+
/x-pack/platform/test/upgrade/services/index.ts @elastic/appex-qa
1757+
/x-pack/platform/test/upgrade/ftr_provider_context.d.ts @elastic/appex-qa
1758+
/x-pack/platform/test/upgrade/config.ts @elastic/appex-qa
17591759
/x-pack/test/functional_basic/ftr_provider_context.d.ts @elastic/appex-qa
17601760
/x-pack/test/functional/services/remote_es/remote_es.ts @elastic/appex-qa
17611761
/x-pack/test/functional/services/random.js @elastic/appex-qa
@@ -1968,8 +1968,8 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
19681968
/src/platform/test/api_integration/apis/saved_objects* @elastic/kibana-core
19691969
/src/platform/test/api_integration/apis/core/*.ts @elastic/kibana-core
19701970
/x-pack/platform/test/functional/apps/saved_objects_management @elastic/kibana-core
1971-
/x-pack/test/usage_collection @elastic/kibana-core
1972-
/x-pack/test/licensing_plugin @elastic/kibana-core
1971+
/x-pack/platform/test/usage_collection @elastic/kibana-core
1972+
/x-pack/platform/test/licensing_plugin @elastic/kibana-core
19731973
/x-pack/platform/test/functional_execution_context @elastic/kibana-core
19741974
/x-pack/platform/test/api_integration/apis/telemetry @elastic/kibana-core
19751975
/x-pack/platform/test/api_integration/apis/status @elastic/kibana-core
@@ -2128,8 +2128,8 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/confi
21282128
/x-pack/test/functional/services/actions @elastic/response-ops
21292129
/x-pack/solutions/security/test/api_integration_basic/apis/security_solution/index.ts @elastic/response-ops @elastic/kibana-cases
21302130
/x-pack/solutions/security/test/api_integration_basic/apis/security_solution/cases_privileges.ts @elastic/response-ops @elastic/kibana-cases
2131-
/x-pack/test/upgrade/services/rules_upgrade_services.ts @elastic/response-ops
2132-
/x-pack/test/upgrade/apps/rules @elastic/response-ops
2131+
/x-pack/platform/test/upgrade/services/rules_upgrade_services.ts @elastic/response-ops
2132+
/x-pack/platform/test/upgrade/apps/rules @elastic/response-ops
21332133
/x-pack/platform/test/examples/triggers_actions_ui_examples @elastic/response-ops # Assigned per https://github.com/elastic/kibana/blob/main/x-pack/examples/triggers_actions_ui_example/kibana.jsonc#L4
21342134
/x-pack/test/functional/services/rules @elastic/response-ops
21352135
/x-pack/platform/test/plugin_api_integration/plugins/sample_task_plugin @elastic/response-ops
@@ -2187,6 +2187,7 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/confi
21872187
/src/platform/test/functional/fixtures/es_archiver/search/downsampled @elastic/search-kibana
21882188
/x-pack/test/functional_solution_sidenav/tests/search_sidenav.ts @elastic/search-kibana
21892189
/x-pack/platform/test/functional/services/search_sessions.ts @elastic/search-kibana
2190+
/x-pack/platform/test/functional/page_objects/search_sessions_management_page.ts @elastic/search-kibana
21902191
/x-pack/test/functional/page_objects/search_* @elastic/search-kibana
21912192
x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/search-kibana
21922193
/x-pack/test/functional/apps/search_playground @elastic/search-kibana

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@
210210
"@kbn/apm-ui-shared": "link:src/platform/packages/shared/kbn-apm-ui-shared",
211211
"@kbn/apm-utils": "link:src/platform/packages/shared/kbn-apm-utils",
212212
"@kbn/app-link-test-plugin": "link:src/platform/test/plugin_functional/plugins/app_link_test",
213-
"@kbn/application-usage-test-plugin": "link:x-pack/test/usage_collection/plugins/application_usage_test",
213+
"@kbn/application-usage-test-plugin": "link:x-pack/platform/test/usage_collection/plugins/application_usage_test",
214214
"@kbn/audit-log-plugin": "link:x-pack/test/security_api_integration/plugins/audit_log",
215215
"@kbn/automatic-import-plugin": "link:x-pack/platform/plugins/shared/automatic_import",
216216
"@kbn/avc-banner": "link:src/platform/packages/shared/kbn-avc-banner",
@@ -974,7 +974,7 @@
974974
"@kbn/sse-utils-server": "link:src/platform/packages/shared/kbn-sse-utils-server",
975975
"@kbn/stack-alerts-plugin": "link:x-pack/platform/plugins/shared/stack_alerts",
976976
"@kbn/stack-connectors-plugin": "link:x-pack/platform/plugins/shared/stack_connectors",
977-
"@kbn/stack-management-usage-test-plugin": "link:x-pack/test/usage_collection/plugins/stack_management_usage_test",
977+
"@kbn/stack-management-usage-test-plugin": "link:x-pack/platform/test/usage_collection/plugins/stack_management_usage_test",
978978
"@kbn/state-containers-examples-plugin": "link:examples/state_containers_examples",
979979
"@kbn/status-plugin-a-plugin": "link:src/platform/test/server_integration/plugins/status_plugin_a",
980980
"@kbn/status-plugin-b-plugin": "link:src/platform/test/server_integration/plugins/status_plugin_b",
@@ -997,7 +997,7 @@
997997
"@kbn/telemetry-management-section-plugin": "link:src/platform/plugins/shared/telemetry_management_section",
998998
"@kbn/telemetry-plugin": "link:src/platform/plugins/shared/telemetry",
999999
"@kbn/telemetry-test-plugin": "link:src/platform/test/plugin_functional/plugins/telemetry",
1000-
"@kbn/test-feature-usage-plugin": "link:x-pack/test/licensing_plugin/plugins/test_feature_usage",
1000+
"@kbn/test-feature-usage-plugin": "link:x-pack/platform/test/licensing_plugin/plugins/test_feature_usage",
10011001
"@kbn/testing-embedded-lens-plugin": "link:x-pack/examples/testing_embedded_lens",
10021002
"@kbn/third-party-lens-navigation-prompt-plugin": "link:x-pack/examples/third_party_lens_navigation_prompt",
10031003
"@kbn/third-party-vis-lens-example-plugin": "link:x-pack/examples/third_party_vis_lens_example",

src/platform/plugins/private/kibana_usage_collection/server/collectors/application_usage/schema.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ const commonSchema: MakeSchemaFrom<ApplicationUsageTelemetryReport[string]> = {
115115
},
116116
};
117117

118-
// There is a test in x-pack/test/usage_collection that validates that the keys in here match all the registered apps
118+
// There is a test in x-pack/platform/test/usage_collection that validates that the keys in here match all the registered apps
119119
export const applicationUsageSchema = {
120120
// OSS
121121
dashboards: commonSchema,

0 commit comments

Comments
 (0)