Skip to content

Commit ae8ff27

Browse files
authored
Merge branch 'main' into cspm/alerts-mapping-update
2 parents 318db3a + 5d696d5 commit ae8ff27

File tree

3,611 files changed

+77849
-64906
lines changed

Some content is hidden

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

3,611 files changed

+77849
-64906
lines changed

.buildkite/ftr_platform_stateful_configs.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ disabled:
5151
# Gen AI suites, running with their own pipeline
5252
- x-pack/test/functional_gen_ai/inference/config.ts
5353

54-
# They will be moved to enabled once the first test is added, the first two initial configs are in disabled section
55-
- x-pack/platform/test/functional/config.firefox.ts
56-
- x-pack/platform/test/functional/config_security_basic.ts
5754

5855
defaultQueue: 'n2-4-spot'
5956
enabled:
@@ -159,7 +156,6 @@ enabled:
159156
- x-pack/platform/test/alerting_api_integration/spaces_only/tests/action_task_params/config.ts
160157
- x-pack/test/api_integration_basic/config.ts
161158
- x-pack/test/api_integration/apis/cases/config.ts
162-
- x-pack/test/api_integration/apis/lists/config.ts
163159
- x-pack/test/api_integration/apis/security/config.ts
164160
- x-pack/test/banners_functional/config.ts
165161
- x-pack/test/cases_api_integration/security_and_spaces/config_basic.ts
@@ -198,7 +194,8 @@ enabled:
198194
- x-pack/test/functional_with_es_ssl/apps/discover_ml_uptime/config.ts
199195
- x-pack/test/functional_with_es_ssl/apps/embeddable_alerts_table/config.ts
200196
- x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/config.ts
201-
- x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors/with_aws_ses_kibana_config/config.ts
197+
- x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors/with_email_aws_ses_kbn_config/config.ts
198+
- x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors/with_email_services_enabled_kbn_config/config.ts
202199
- x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/shared/config.ts
203200
- x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors/webhook_disabled_ssl_pfx/config.ts
204201
- x-pack/test/functional/apps/advanced_settings/config.ts
@@ -256,9 +253,9 @@ enabled:
256253
- x-pack/test/functional/apps/saved_objects_management/config.ts
257254
- x-pack/test/functional/apps/saved_query_management/config.ts
258255
- x-pack/test/functional/apps/saved_query_management/config.v2.ts
259-
- x-pack/test/functional/apps/security/config.ts
256+
- x-pack/platform/test/functional/apps/security/config.ts
260257
- x-pack/test/functional/apps/snapshot_restore/config.ts
261-
- x-pack/test/functional/apps/spaces/config.ts
258+
- x-pack/platform/test/functional/apps/spaces/config.ts
262259
- x-pack/test/functional/apps/status_page/config.ts
263260
- x-pack/test/functional/apps/transform/creation/index_pattern/config.ts
264261
- x-pack/test/functional/apps/transform/creation/runtime_mappings_saved_search/config.ts
@@ -270,9 +267,10 @@ enabled:
270267
- x-pack/test/functional/apps/user_profiles/config.ts
271268
- x-pack/test/functional/apps/visualize/config.ts
272269
- x-pack/test/functional/apps/watcher/config.ts
273-
- x-pack/test/functional/config_security_basic.ts
270+
- x-pack/platform/test/functional/config_security_basic.ts
274271
- x-pack/test/functional/config.ccs.ts
275272
- x-pack/test/functional/config.firefox.js
273+
- x-pack/platform/test/functional/config.firefox.ts
276274
- x-pack/test/functional/config.upgrade_assistant.ts
277275
- x-pack/test/functional_cloud/config.ts
278276
- x-pack/test/functional_cloud/saml.config.ts
@@ -407,3 +405,4 @@ enabled:
407405
- x-pack/platform/test/saved_object_api_integration/security_and_spaces/config_trial.ts
408406
- x-pack/platform/test/saved_object_api_integration/spaces_only/config.ts
409407
- x-pack/platform/test/saved_object_api_integration/user_profiles/config.ts
408+
- src/platform/test/api_integration/apis/unused_urls_task/config.ts

.buildkite/ftr_search_stateful_configs.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ defaultQueue: 'n2-4-spot'
66
enabled:
77
- x-pack/test/functional_search/config.ts
88
- x-pack/test/functional/apps/search_playground/config.ts
9+
- x-pack/solutions/search/test/functional_search/config/config.feature_flags.ts
910
- x-pack/solutions/search/test/api_integration/apis/search_playground/config.ts
10-
11+
- x-pack/solutions/search/test/api_integration/apis/guided_onboarding/config.ts

.buildkite/pipelines/pull_request/base.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ steps:
1313
agents:
1414
machineType: n2-standard-8
1515
preemptible: true
16-
diskSizeGb: 125
16+
diskSizeGb: 150
1717
key: build
1818
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
1919
timeout_in_minutes: 90

.buildkite/scripts/common/setup_node.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ elif [[ "$UNAME" == "Darwin" ]]; then
3131
fi
3232
echo " -- Running on OS: $OS"
3333

34-
NODE_VARIANT=""
34+
NODE_VARIANT="node-glibc-217/"
3535
if [[ "${CI_FORCE_NODE_POINTER_COMPRESSION:-}" = "true" ]]; then
3636
NODE_VARIANT="node-pointer-compression/"
3737
# Node.js 20.15.1 with pointer compression enabled

.eslintrc.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2272,9 +2272,6 @@ module.exports = {
22722272
'x-pack/platform/plugins/shared/osquery/**',
22732273
// FIXME PhilippeOberti @kbn/timelines-plugin depends on security-solution-plugin (security/private) (timelines is going to disappear)
22742274
'x-pack/platform/plugins/shared/timelines/**',
2275-
// FIXME @dmlemeshko
2276-
`src/platform/test/api_integration/apis/guided_onboarding/get_guides.ts`,
2277-
`src/platform/test/api_integration/apis/guided_onboarding/put_state.ts`,
22782275

22792276
// For now, we keep the exception to let tests depend on anythying.
22802277
// Ideally, we need to classify the solution specific ones to reduce CI times

0 commit comments

Comments
 (0)