Skip to content

Commit 7d40c97

Browse files
flash1293flash1293
authored
Merge branch 'main' into 226059-refresh-ilm-phases
2 parents c98d50d + e11145c commit 7d40c97

1,610 files changed

Lines changed: 24918 additions & 11576 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/.mocharc.json‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.buildkite/ftr_platform_stateful_configs.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ disabled:
22
# Stateful base config for deployment-agnostic tests
33
- x-pack/test/api_integration/deployment_agnostic/default_configs/stateful.config.base.ts
44
- x-pack/test/api_integration/deployment_agnostic/default_configs/feature_flag.stateful.config.base.ts
5+
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/default_configs/serverless.config.base.ts
6+
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/default_configs/stateful.config.base.ts
57

68
# Base config files, only necessary to inform config finding script
79
- src/platform/test/functional/config.base.js
@@ -51,7 +53,6 @@ disabled:
5153
# Gen AI suites, running with their own pipeline
5254
- x-pack/test/functional_gen_ai/inference/config.ts
5355

54-
5556
defaultQueue: 'n2-4-spot'
5657
enabled:
5758
- src/platform/test/accessibility/config.ts
@@ -250,11 +251,11 @@ enabled:
250251
- x-pack/test/functional/apps/remote_clusters/config.ts
251252
- x-pack/platform/test/functional/apps/reporting_management/config.ts
252253
- x-pack/test/functional/apps/rollup_job/config.ts
253-
- x-pack/test/functional/apps/saved_objects_management/config.ts
254-
- x-pack/test/functional/apps/saved_query_management/config.ts
255-
- x-pack/test/functional/apps/saved_query_management/config.v2.ts
254+
- x-pack/platform/test/functional/apps/saved_objects_management/config.ts
255+
- x-pack/platform/test/functional/apps/saved_query_management/config.ts
256+
- x-pack/platform/test/functional/apps/saved_query_management/config.v2.ts
256257
- x-pack/platform/test/functional/apps/security/config.ts
257-
- x-pack/test/functional/apps/snapshot_restore/config.ts
258+
- x-pack/platform/test/functional/apps/snapshot_restore/config.ts
258259
- x-pack/platform/test/functional/apps/spaces/config.ts
259260
- x-pack/test/functional/apps/status_page/config.ts
260261
- x-pack/test/functional/apps/transform/creation/index_pattern/config.ts
@@ -327,9 +328,9 @@ enabled:
327328
- x-pack/test/security_functional/user_profiles.config.ts
328329
- x-pack/test/security_functional/expired_session.config.ts
329330
- x-pack/test/session_view/basic/config.ts
330-
- x-pack/test/spaces_api_integration/security_and_spaces/config_basic.ts
331-
- x-pack/test/spaces_api_integration/security_and_spaces/config_trial.ts
332-
- x-pack/test/spaces_api_integration/spaces_only/config.ts
331+
- x-pack/platform/test/spaces_api_integration/security_and_spaces/config_basic.ts
332+
- x-pack/platform/test/spaces_api_integration/security_and_spaces/config_trial.ts
333+
- x-pack/platform/test/spaces_api_integration/spaces_only/config.ts
333334
- x-pack/platform/test/task_manager_claimer_update_by_query/config.ts
334335
- x-pack/test/ui_capabilities/security_and_spaces/config.ts
335336
- x-pack/test/ui_capabilities/spaces_only/config.ts

‎.buildkite/ftr_security_serverless_configs.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ enabled:
8181
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/configs/serverless.config.ts
8282
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/diffable_rule_fields/common_fields/configs/serverless.config.ts
8383
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/diffable_rule_fields/type_specific_fields/configs/serverless.config.ts
84+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/configs/serverless_essentials_tier.config.ts
8485
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_bulk_actions/trial_license_complete_tier/configs/serverless.config.ts
8586
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/trial_license_complete_tier/configs/serverless.config.ts
8687
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/basic_license_essentials_tier/configs/serverless.config.ts
@@ -131,5 +132,5 @@ enabled:
131132
- x-pack/test/security_solution_api_integration/test_suites/ai4dsoc/nlp_cleanup_task/search_ai_lake_tier/configs/serverless.config.ts
132133
# serverless config files that run deployment-agnostic tests
133134
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/security.serverless.config.ts
134-
- x-pack/test/spaces_api_integration/deployment_agnostic/security_and_spaces/serverless.config.ts
135-
- x-pack/test/spaces_api_integration/deployment_agnostic/security_and_spaces/serverless.copy_to_space.config.ts
135+
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/security_and_spaces/serverless.config.ts
136+
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/security_and_spaces/serverless.copy_to_space.config.ts

‎.buildkite/ftr_security_stateful_configs.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ enabled:
6767
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/configs/ess.config.ts
6868
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/diffable_rule_fields/common_fields/configs/ess.config.ts
6969
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/diffable_rule_fields/type_specific_fields/configs/ess.config.ts
70+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/configs/ess_basic_license.config.ts
7071
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_bulk_actions/trial_license_complete_tier/configs/ess.config.ts
7172
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/trial_license_complete_tier/configs/ess.config.ts
7273
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/basic_license_essentials_tier/configs/ess.config.ts
@@ -114,11 +115,11 @@ enabled:
114115
- x-pack/solutions/security/test/cloud_security_posture_functional/config.ts
115116
- x-pack/solutions/security/test/cloud_security_posture_functional/config.agentless.ts
116117
- x-pack/solutions/security/test/cloud_security_posture_functional/data_views/config.ts
117-
- x-pack/test/spaces_api_integration/deployment_agnostic/spaces_only/config.ts
118-
- x-pack/test/spaces_api_integration/deployment_agnostic/security_and_spaces/stateful.config_basic.ts
119-
- x-pack/test/spaces_api_integration/deployment_agnostic/security_and_spaces/stateful.config_trial.ts
120-
- x-pack/test/spaces_api_integration/deployment_agnostic/security_and_spaces/stateful.copy_to_space.config_trial.ts
121-
- x-pack/test/spaces_api_integration/deployment_agnostic/security_and_spaces/stateful.copy_to_space.config_basic.ts
118+
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/spaces_only/config.ts
119+
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/security_and_spaces/stateful.config_basic.ts
120+
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/security_and_spaces/stateful.config_trial.ts
121+
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/security_and_spaces/stateful.copy_to_space.config_trial.ts
122+
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/security_and_spaces/stateful.copy_to_space.config_basic.ts
122123
- x-pack/solutions/security/test/alerting_api_integration/security_and_spaces/group1/config.ts
123124
- x-pack/solutions/security/test/alerting_api_integration/security_and_spaces/group2/config.ts
124125
- x-pack/solutions/security/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts

‎.buildkite/jest.config.js‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the "Elastic License
4+
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
5+
* Public License v 1"; you may not use this file except in compliance with, at
6+
* your election, the "Elastic License 2.0", the "GNU Affero General Public
7+
* License v3.0 only", or the "Server Side Public License, v 1".
8+
*/
9+
10+
const { createJsWithTsEsmPreset } = require('ts-jest');
11+
12+
const tsJestTransformCfg = createJsWithTsEsmPreset().transform;
13+
14+
/** @type {import("jest").Config} **/
15+
module.exports = {
16+
testEnvironment: 'node',
17+
transform: {
18+
...tsJestTransformCfg,
19+
},
20+
transformIgnorePatterns: [
21+
'node_modules/(?!(@octokit/.*|universal-user-agent|before-after-hook)/)',
22+
],
23+
};

0 commit comments

Comments
 (0)