Skip to content

Commit f9d89c8

Browse files
dplumleedplumlee
committed
Merge remote-tracking branch 'upstream/main' into related-integration-ui-performance
2 parents 790a90f + 760106e commit f9d89c8

3,427 files changed

Lines changed: 77785 additions & 84632 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/ftr_chat_serverless_configs.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
disabled:
2+
# Base config files, only necessary to inform config finding script
3+
4+
defaultQueue: 'n2-4-spot'
5+
enabled:
6+
- x-pack/test_serverless/api_integration/test_suites/chat/config.ts
7+
- x-pack/test_serverless/api_integration/test_suites/chat/config.feature_flags.ts
8+
- x-pack/test_serverless/api_integration/test_suites/chat/common_configs/config.group1.ts
9+
- x-pack/test_serverless/functional/test_suites/chat/config.ts
10+
- x-pack/test_serverless/functional/test_suites/chat/config.feature_flags.ts
11+
- x-pack/test_serverless/functional/test_suites/chat/common_configs/config.group1.ts

‎.buildkite/ftr_configs_manifests.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
".buildkite/ftr_base_serverless_configs.yml",
1010
".buildkite/ftr_oblt_serverless_configs.yml",
1111
".buildkite/ftr_security_serverless_configs.yml",
12-
".buildkite/ftr_search_serverless_configs.yml"
12+
".buildkite/ftr_search_serverless_configs.yml",
13+
".buildkite/ftr_chat_serverless_configs.yml"
1314
]
14-
}
15+
}

‎.buildkite/ftr_oblt_serverless_configs.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,7 @@ enabled:
3030
- x-pack/test_serverless/functional/test_suites/observability/config.telemetry.ts
3131
# serverless config files that run deployment-agnostic tests
3232
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts
33+
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.ai_assistant.serverless.config.ts
3334
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.apm.serverless.config.ts
35+
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.synthetics.serverless.config.ts
36+
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.streams.serverless.config.ts

‎.buildkite/ftr_platform_stateful_configs.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ enabled:
8080
- src/platform/test/functional/apps/discover/group6/config.ts
8181
- src/platform/test/functional/apps/discover/group7/config.ts
8282
- src/platform/test/functional/apps/discover/group8/config.ts
83+
- src/platform/test/functional/apps/discover/group9/config.ts
84+
- src/platform/test/functional/apps/discover/group10/config.ts
8385
- src/platform/test/functional/apps/discover/context_awareness/config.ts
8486
- src/platform/test/functional/apps/discover/observability/config.ts
8587
- src/platform/test/functional/apps/getting_started/config.ts
@@ -266,6 +268,7 @@ enabled:
266268
- x-pack/test/functional/apps/rollup_job/config.ts
267269
- x-pack/test/functional/apps/saved_objects_management/config.ts
268270
- x-pack/test/functional/apps/saved_query_management/config.ts
271+
- x-pack/test/functional/apps/saved_query_management/config.v2.ts
269272
- x-pack/test/functional/apps/security/config.ts
270273
- x-pack/test/functional/apps/snapshot_restore/config.ts
271274
- x-pack/test/functional/apps/spaces/config.ts

‎.buildkite/ftr_security_serverless_configs.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ disabled:
2424
# MKI only configs files
2525
- x-pack/test_serverless/functional/test_suites/security/config.mki_only.ts
2626

27-
defaultQueue: 'n2-4-spot'
27+
defaultQueue: "n2-4-spot"
2828
enabled:
2929
- x-pack/test_serverless/api_integration/test_suites/security/config.ts
3030
- x-pack/test_serverless/api_integration/test_suites/security/config.feature_flags.ts
@@ -106,6 +106,7 @@ enabled:
106106
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/configs/serverless.config.ts
107107
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/basic_license_essentials_tier/configs/serverless.config.ts
108108
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/entity_store/trial_license_complete_tier/configs/serverless.config.ts
109+
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/monitoring/trial_license_complete_tier/configs/serverless.config.ts
109110
- x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/exception_lists_items/trial_license_complete_tier/configs/serverless.config.ts
110111
- x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/configs/serverless.config.ts
111112
- x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/configs/serverless.config.ts

‎.buildkite/ftr_security_stateful_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ enabled:
8181
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/configs/ess.config.ts
8282
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/basic_license_essentials_tier/configs/ess.config.ts
8383
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/entity_store/trial_license_complete_tier/configs/ess.config.ts
84+
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/monitoring/trial_license_complete_tier/configs/ess.config.ts
8485
- x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/exception_lists_items/trial_license_complete_tier/configs/ess.config.ts
8586
- x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/lists_items/trial_license_complete_tier/configs/ess.config.ts
8687
- x-pack/test/security_solution_api_integration/test_suites/explore/hosts/trial_license_complete_tier/configs/ess.config.ts

‎.buildkite/pipelines/pull_request/scout_tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ steps:
88
SCOUT_CONFIGS_SCRIPT: '.buildkite/scripts/steps/test/scout_configs.sh'
99
retry:
1010
automatic:
11-
# No retry when Scout CI config validation fails
11+
# No retry when Scout configs fail
1212
- exit_status: 10
1313
limit: 0
1414
- exit_status: '*'

‎.buildkite/scripts/steps/artifacts/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set -euo pipefail
77
source .buildkite/scripts/steps/artifacts/env.sh
88

99
echo "--- Build Kibana artifacts"
10-
node scripts/build --all-platforms --debug --docker-cross-compile --skip-docker-fips --skip-docker-cloud-fips --skip-docker-serverless --skip-cdn-assets "${BUILD_ARGS[@]}"
10+
node scripts/build --all-platforms --debug --docker-cross-compile --skip-docker-fips --skip-docker-serverless --skip-cdn-assets "${BUILD_ARGS[@]}"
1111

1212
echo "--- Extract default i18n messages"
1313
mkdir -p target/i18n

‎.buildkite/scripts/steps/artifacts/publish.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ download "kibana-cloud-$FULL_VERSION-docker-build-context.tar.gz"
3535
download "kibana-ironbank-$FULL_VERSION-docker-build-context.tar.gz"
3636
download "kibana-wolfi-$FULL_VERSION-docker-build-context.tar.gz"
3737

38+
download "kibana-cloud-fips-$FULL_VERSION-docker-build-context.tar.gz"
39+
download "kibana-cloud-fips-$FULL_VERSION-docker-image-aarch64.tar.gz"
40+
download "kibana-cloud-fips-$FULL_VERSION-docker-image.tar.gz"
41+
3842
download "kibana-$FULL_VERSION-linux-aarch64.tar.gz"
3943
download "kibana-$FULL_VERSION-linux-x86_64.tar.gz"
4044

‎.buildkite/scripts/steps/checks/capture_oas_snapshot.sh‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,18 @@ source .buildkite/scripts/common/util.sh
88
.buildkite/scripts/copy_es_snapshot_cache.sh
99

1010
echo --- Capture OAS snapshot
11-
cmd="node scripts/capture_oas_snapshot --include-path /api/status --include-path /api/alerting/rule/ --include-path /api/alerting/rules --include-path /api/actions --include-path /api/security/role --include-path /api/spaces --include-path /api/streams --include-path /api/fleet --include-path /api/dashboards"
11+
cmd="node scripts/capture_oas_snapshot \
12+
--include-path /api/status \
13+
--include-path /api/alerting/rule/ \
14+
--include-path /api/alerting/rules \
15+
--include-path /api/actions \
16+
--include-path /api/security/role \
17+
--include-path /api/spaces \
18+
--include-path /api/streams \
19+
--include-path /api/fleet \
20+
--include-path /api/dashboards \
21+
--include-path /api/saved_objects/_import \
22+
--include-path /api/saved_objects/_export"
1223
if is_pr && ! is_auto_commit_disabled; then
1324
cmd="$cmd --update"
1425
fi

0 commit comments

Comments
 (0)