Merge branch 'main' into renovate/main-@xyflowreact

Author: kfirpeled

.buildkite/ftr_base_serverless_configs.yml

@@ -15,3 +15,4 @@ enabled:
   - x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/search.serverless.config.ts
   - x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/security.serverless.config.ts
   - x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/oblt.logs_essentials.serverless.config.ts
+  - x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/oblt.streams.serverless.config.ts

.buildkite/ftr_oblt_serverless_configs.yml

@@ -44,5 +44,4 @@ enabled:
   - x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.ai_assistant.serverless.config.ts
   - x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.apm.serverless.config.ts
   - x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.synthetics.serverless.config.ts
-  - x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.streams.serverless.config.ts
   - x-pack/solutions/observability/test/api_integration_deployment_agnostic/feature_flag_configs/serverless/oblt.serverless.config.ts

.buildkite/ftr_oblt_stateful_configs.yml

@@ -1,12 +1,12 @@
 disabled:
   # Cypress configs, for now these are still run manually
-  - x-pack/test/apm_cypress/cli_config.ts
+  - x-pack/solutions/observability/test/apm_cypress/cli_config.ts
   - x-pack/solutions/observability/plugins/observability_onboarding/e2e/ftr_config_open.ts
   - x-pack/solutions/observability/plugins/observability_onboarding/e2e/ftr_config_runner.ts
   - x-pack/solutions/observability/plugins/observability_onboarding/e2e/ftr_config.ts
   - x-pack/solutions/observability/plugins/inventory/e2e/ftr_config_run.ts
   - x-pack/solutions/observability/plugins/inventory/e2e/ftr_config.ts
-  - x-pack/test/profiling_cypress/cli_config.ts
+  - x-pack/solutions/observability/test/profiling_cypress/cli_config.ts
   #FTR configs
   - x-pack/solutions/observability/plugins/uptime/e2e/config.ts
   - x-pack/solutions/observability/test/api_integration/config.ts

.buildkite/ftr_platform_stateful_configs.yml

@@ -20,7 +20,7 @@ disabled:
   - x-pack/platform/test/ui_capabilities/common/config.ts
 
   # QA suites that are run out-of-band
-  - x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js
+  - x-pack/platform/test/stack_functional_integration/configs/config.stack_functional_integration_base.js
   - x-pack/platform/test/upgrade/config.ts
   - src/platform/test/functional/config.edge.js
   - x-pack/platform/test/functional/config.edge.ts
@@ -39,11 +39,11 @@ disabled:
   - x-pack/platform/test/scalability/config.ts
 
   # Cypress configs, for now these are still run manually
-  - x-pack/test/fleet_cypress/cli_config.ts
-  - x-pack/test/fleet_cypress/cli_config.space_awareness.ts
-  - x-pack/test/fleet_cypress/config.ts
-  - x-pack/test/fleet_cypress/config.space_awareness.ts
-  - x-pack/test/fleet_cypress/visual_config.ts
+  - x-pack/platform/test/fleet_cypress/cli_config.ts
+  - x-pack/platform/test/fleet_cypress/cli_config.space_awareness.ts
+  - x-pack/platform/test/fleet_cypress/config.ts
+  - x-pack/platform/test/fleet_cypress/config.space_awareness.ts
+  - x-pack/platform/test/fleet_cypress/visual_config.ts
 
   # Default http2 config to use for performance journeys
   - x-pack/performance/configs/http2_config.ts
@@ -202,38 +202,38 @@ enabled:
   - x-pack/platform/test/functional/apps/api_keys/config.ts
   - x-pack/platform/test/functional/apps/canvas/config.ts
   - x-pack/platform/test/functional/apps/cross_cluster_replication/config.ts
-  - x-pack/test/functional/apps/dashboard/group1/config.ts
-  - x-pack/test/functional/apps/dashboard/group2/config.ts
-  - x-pack/test/functional/apps/dashboard/group3/config.ts
+  - x-pack/platform/test/functional/apps/dashboard/group1/config.ts
+  - x-pack/platform/test/functional/apps/dashboard/group2/config.ts
+  - x-pack/platform/test/functional/apps/dashboard/group3/config.ts
   - x-pack/platform/test/functional/apps/data_views/config.ts
   - x-pack/platform/test/functional/apps/dev_tools/config.ts
-  - x-pack/test/functional/apps/discover/group1/config.ts
-  - x-pack/test/functional/apps/discover/group2/config.ts
-  - x-pack/test/functional/apps/discover/group3/config.ts
+  - x-pack/platform/test/functional/apps/discover/group1/config.ts
+  - x-pack/platform/test/functional/apps/discover/group2/config.ts
+  - x-pack/platform/test/functional/apps/discover/group3/config.ts
   - x-pack/platform/test/functional/apps/graph/config.ts
   - x-pack/platform/test/functional/apps/grok_debugger/config.ts
   - x-pack/platform/test/functional/apps/home/config.ts
-  - x-pack/test/functional/apps/index_lifecycle_management/config.ts
-  - x-pack/test/functional/apps/index_management/config.ts
-  - x-pack/test/functional/apps/ingest_pipelines/config.ts
-  - x-pack/test/functional/apps/lens/group1/config.ts
-  - x-pack/test/functional/apps/lens/group2/config.ts
-  - x-pack/test/functional/apps/lens/group3/config.ts
-  - x-pack/test/functional/apps/lens/group4/config.ts
-  - x-pack/test/functional/apps/lens/group5/config.ts
-  - x-pack/test/functional/apps/lens/group6/config.ts
-  - x-pack/test/functional/apps/lens/group7/config.ts
-  - x-pack/test/functional/apps/lens/open_in_lens/tsvb/config.ts
-  - x-pack/test/functional/apps/lens/open_in_lens/agg_based/config.ts
-  - x-pack/test/functional/apps/lens/open_in_lens/dashboard/config.ts
+  - x-pack/platform/test/functional/apps/index_lifecycle_management/config.ts
+  - x-pack/platform/test/functional/apps/index_management/config.ts
+  - x-pack/platform/test/functional/apps/ingest_pipelines/config.ts
+  - x-pack/platform/test/functional/apps/lens/group1/config.ts
+  - x-pack/platform/test/functional/apps/lens/group2/config.ts
+  - x-pack/platform/test/functional/apps/lens/group3/config.ts
+  - x-pack/platform/test/functional/apps/lens/group4/config.ts
+  - x-pack/platform/test/functional/apps/lens/group5/config.ts
+  - x-pack/platform/test/functional/apps/lens/group6/config.ts
+  - x-pack/platform/test/functional/apps/lens/group7/config.ts
+  - x-pack/platform/test/functional/apps/lens/open_in_lens/tsvb/config.ts
+  - x-pack/platform/test/functional/apps/lens/open_in_lens/agg_based/config.ts
+  - x-pack/platform/test/functional/apps/lens/open_in_lens/dashboard/config.ts
   - x-pack/platform/test/functional/apps/license_management/config.ts
-  - x-pack/test/functional/apps/logstash/config.ts
+  - x-pack/platform/test/functional/apps/logstash/config.ts
   - x-pack/platform/test/functional/apps/managed_content/config.ts
   - x-pack/platform/test/functional/apps/management/config.ts
-  - x-pack/test/functional/apps/maps/group1/config.ts
-  - x-pack/test/functional/apps/maps/group2/config.ts
-  - x-pack/test/functional/apps/maps/group3/config.ts
-  - x-pack/test/functional/apps/maps/group4/config.ts
+  - x-pack/platform/test/functional/apps/maps/group1/config.ts
+  - x-pack/platform/test/functional/apps/maps/group2/config.ts
+  - x-pack/platform/test/functional/apps/maps/group3/config.ts
+  - x-pack/platform/test/functional/apps/maps/group4/config.ts
   - x-pack/platform/test/functional/apps/ml/anomaly_detection_jobs/config.ts
   - x-pack/platform/test/functional/apps/ml/anomaly_detection_integrations/config.ts
   - x-pack/platform/test/functional/apps/ml/anomaly_detection_result_views/config.ts
@@ -245,16 +245,16 @@ enabled:
   - x-pack/platform/test/functional/apps/ml/memory_usage/config.ts
   - x-pack/test/functional/apps/monitoring/config.ts
   - x-pack/platform/test/functional/apps/painless_lab/config.ts
-  - x-pack/test/functional/apps/remote_clusters/config.ts
+  - x-pack/platform/test/functional/apps/remote_clusters/config.ts
   - x-pack/platform/test/functional/apps/reporting_management/config.ts
-  - x-pack/test/functional/apps/rollup_job/config.ts
+  - x-pack/platform/test/functional/apps/rollup_job/config.ts
   - x-pack/platform/test/functional/apps/saved_objects_management/config.ts
   - x-pack/platform/test/functional/apps/saved_query_management/config.ts
   - x-pack/platform/test/functional/apps/saved_query_management/config.v2.ts
   - x-pack/platform/test/functional/apps/security/config.ts
   - x-pack/platform/test/functional/apps/snapshot_restore/config.ts
   - x-pack/platform/test/functional/apps/spaces/config.ts
-  - x-pack/test/functional/apps/status_page/config.ts
+  - x-pack/platform/test/functional/apps/status_page/config.ts
   - x-pack/platform/test/functional/apps/transform/creation/index_pattern/config.ts
   - x-pack/platform/test/functional/apps/transform/creation/runtime_mappings_saved_search/config.ts
   - x-pack/platform/test/functional/apps/transform/actions/config.ts
@@ -263,17 +263,17 @@ enabled:
   - x-pack/platform/test/functional/apps/transform/feature_controls/config.ts
   - x-pack/platform/test/functional/apps/upgrade_assistant/config.ts
   - x-pack/platform/test/functional/apps/user_profiles/config.ts
-  - x-pack/test/functional/apps/visualize/config.ts
+  - x-pack/platform/test/functional/apps/visualize/config.ts
   - x-pack/platform/test/functional/apps/watcher/config.ts
   - x-pack/platform/test/functional/config_security_basic.ts
-  - x-pack/test/functional/config.ccs.ts
+  - x-pack/platform/test/functional/config.ccs.ts
   - x-pack/platform/test/functional/config.firefox.ts
   - x-pack/platform/test/functional/config.upgrade_assistant.ts
   - x-pack/platform/test/functional_cloud/config.ts
   - x-pack/platform/test/functional_cloud/saml.config.ts
   - x-pack/platform/test/licensing_plugin/config.public.ts
   - x-pack/platform/test/licensing_plugin/config.ts
-  - x-pack/test/plugin_functional/config.ts
+  - x-pack/platform/test/plugin_functional/config.ts
   - x-pack/platform/test/reporting_api_integration/reporting_and_security.config.ts
   - x-pack/platform/test/reporting_api_integration/reporting_without_security.config.ts
   - x-pack/platform/test/reporting_functional/reporting_and_security.config.ts
@@ -288,40 +288,40 @@ enabled:
   - x-pack/platform/test/saved_object_tagging/functional/config.ts
   - x-pack/platform/test/saved_objects_field_count/config.ts
   - x-pack/platform/test/search_sessions_integration/config.ts
-  - x-pack/test/security_api_integration/anonymous_es_anonymous.config.ts
-  - x-pack/test/security_api_integration/anonymous.config.ts
-  - x-pack/test/security_api_integration/api_keys.config.ts
-  - x-pack/test/security_api_integration/audit.config.ts
-  - x-pack/test/security_api_integration/http_bearer.config.ts
-  - x-pack/test/security_api_integration/http_no_auth_providers.config.ts
-  - x-pack/test/security_api_integration/kerberos_anonymous_access.config.ts
-  - x-pack/test/security_api_integration/kerberos.config.ts
-  - x-pack/test/security_api_integration/login_selector.config.ts
-  - x-pack/test/security_api_integration/oidc_implicit_flow.config.ts
-  - x-pack/test/security_api_integration/oidc.config.ts
-  - x-pack/test/security_api_integration/oidc.http2.config.ts
-  - x-pack/test/security_api_integration/pki.config.ts
-  - x-pack/test/security_api_integration/saml.config.ts
-  - x-pack/test/security_api_integration/saml.http2.config.ts
-  - x-pack/test/security_api_integration/saml_cloud.config.ts
-  - x-pack/test/security_api_integration/chips.config.ts
-  - x-pack/test/security_api_integration/features.config.ts
-  - x-pack/test/security_api_integration/session_cookie.config.ts
-  - x-pack/test/security_api_integration/session_idle.config.ts
-  - x-pack/test/security_api_integration/session_shard_missing.config.ts
-  - x-pack/test/security_api_integration/session_invalidate.config.ts
-  - x-pack/test/security_api_integration/session_lifespan.config.ts
-  - x-pack/test/security_api_integration/session_concurrent_limit.config.ts
-  - x-pack/test/security_api_integration/token.config.ts
-  - x-pack/test/security_api_integration/user_profiles.config.ts
-  - x-pack/test/security_functional/login_selector.config.ts
-  - x-pack/test/security_functional/oidc.config.ts
-  - x-pack/test/security_functional/saml.config.ts
-  - x-pack/test/security_functional/saml.http2.config.ts
-  - x-pack/test/security_functional/oidc.http2.config.ts
-  - x-pack/test/security_functional/insecure_cluster_warning.config.ts
-  - x-pack/test/security_functional/user_profiles.config.ts
-  - x-pack/test/security_functional/expired_session.config.ts
+  - x-pack/platform/test/security_api_integration/anonymous_es_anonymous.config.ts
+  - x-pack/platform/test/security_api_integration/anonymous.config.ts
+  - x-pack/platform/test/security_api_integration/api_keys.config.ts
+  - x-pack/platform/test/security_api_integration/audit.config.ts
+  - x-pack/platform/test/security_api_integration/http_bearer.config.ts
+  - x-pack/platform/test/security_api_integration/http_no_auth_providers.config.ts
+  - x-pack/platform/test/security_api_integration/kerberos_anonymous_access.config.ts
+  - x-pack/platform/test/security_api_integration/kerberos.config.ts
+  - x-pack/platform/test/security_api_integration/login_selector.config.ts
+  - x-pack/platform/test/security_api_integration/oidc_implicit_flow.config.ts
+  - x-pack/platform/test/security_api_integration/oidc.config.ts
+  - x-pack/platform/test/security_api_integration/oidc.http2.config.ts
+  - x-pack/platform/test/security_api_integration/pki.config.ts
+  - x-pack/platform/test/security_api_integration/saml.config.ts
+  - x-pack/platform/test/security_api_integration/saml.http2.config.ts
+  - x-pack/platform/test/security_api_integration/saml_cloud.config.ts
+  - x-pack/platform/test/security_api_integration/chips.config.ts
+  - x-pack/platform/test/security_api_integration/features.config.ts
+  - x-pack/platform/test/security_api_integration/session_cookie.config.ts
+  - x-pack/platform/test/security_api_integration/session_idle.config.ts
+  - x-pack/platform/test/security_api_integration/session_shard_missing.config.ts
+  - x-pack/platform/test/security_api_integration/session_invalidate.config.ts
+  - x-pack/platform/test/security_api_integration/session_lifespan.config.ts
+  - x-pack/platform/test/security_api_integration/session_concurrent_limit.config.ts
+  - x-pack/platform/test/security_api_integration/token.config.ts
+  - x-pack/platform/test/security_api_integration/user_profiles.config.ts
+  - x-pack/platform/test/security_functional/login_selector.config.ts
+  - x-pack/platform/test/security_functional/oidc.config.ts
+  - x-pack/platform/test/security_functional/saml.config.ts
+  - x-pack/platform/test/security_functional/saml.http2.config.ts
+  - x-pack/platform/test/security_functional/oidc.http2.config.ts
+  - x-pack/platform/test/security_functional/insecure_cluster_warning.config.ts
+  - x-pack/platform/test/security_functional/user_profiles.config.ts
+  - x-pack/platform/test/security_functional/expired_session.config.ts
   - x-pack/solutions/security/test/session_view/basic/config.ts
   - x-pack/platform/test/spaces_api_integration/security_and_spaces/config_basic.ts
   - x-pack/platform/test/spaces_api_integration/security_and_spaces/config_trial.ts

.buildkite/ftr_search_stateful_configs.yml

@@ -6,7 +6,6 @@ defaultQueue: 'n2-4-spot'
 enabled:
   - x-pack/solutions/search/test/functional_search/config.ts
   - x-pack/test/functional/apps/search_playground/config.ts
-  - x-pack/solutions/search/test/functional/config/config.feature_flags.ts
+  - x-pack/solutions/search/test/functional_search/config/config.feature_flags.ts
   - x-pack/solutions/search/test/api_integration/apis/search_playground/config.ts
-  - x-pack/solutions/search/test/api_integration/apis/guided_onboarding/config.ts
   - x-pack/solutions/search/test/functional_solution_sidenav/config.ts

.buildkite/ftr_security_stateful_configs.yml

@@ -134,3 +134,4 @@ enabled:
   - x-pack/solutions/security/test/fleet_api_integration/config.epm.ts
   - x-pack/solutions/security/test/fleet_api_integration/config.package_policy.ts
   - x-pack/solutions/security/test/functional_solution_sidenav/config.ts
+  - x-pack/solutions/security/test/plugin_functional/config.ts

.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts

@@ -564,7 +564,6 @@ export async function pickScoutTestGroupRunOrder(scoutConfigsPath: string) {
     [
       {
         group: 'Scout Configs',
-        key: 'scout-configs',
         depends_on: ['build'],
         steps: scoutGroups.map(
           ({ title, key, group, usesParallelWorkers }): BuildkiteStep => ({

.buildkite/scripts/bootstrap.sh

@@ -26,7 +26,8 @@ if [[ "$(pwd)" != *"/local-ssd/"* && "$(pwd)" != "/dev/shm"* ]]; then
   fi
 fi
 
-if ! yarn kbn bootstrap "${BOOTSTRAP_PARAMS[@]}"; then
+# TODO: revisit the double bootstrap per attempt after removing Bazel and changing package manager.
+if ! (yarn kbn bootstrap "${BOOTSTRAP_PARAMS[@]}" || yarn kbn bootstrap "${BOOTSTRAP_PARAMS[@]}"); then
   echo "bootstrap failed, trying again in 15 seconds"
   sleep 15
 
@@ -35,7 +36,7 @@ if ! yarn kbn bootstrap "${BOOTSTRAP_PARAMS[@]}"; then
   rm -rf node_modules
 
   echo "--- yarn install and bootstrap, attempt 2"
-  yarn kbn bootstrap --force-install
+  yarn kbn bootstrap --force-install || yarn kbn bootstrap
 fi
 
 if [[ "$DISABLE_BOOTSTRAP_VALIDATION" != "true" ]]; then

.buildkite/scripts/pipelines/security_solution_quality_gate/create_periodic_test_docker_image.sh

@@ -44,11 +44,11 @@ node scripts/build \
 
 echo "--- Tag images"
 docker rmi "$KIBANA_IMAGE"
-docker load < "target/kibana-serverless-$BASE_VERSION-docker-image.tar.gz"
+docker load < "target/kibana-serverless-$BASE_VERSION-docker-image-amd64.tar.gz"
 docker tag "$KIBANA_IMAGE" "$KIBANA_IMAGE-amd64"
 
 docker rmi "$KIBANA_IMAGE"
-docker load < "target/kibana-serverless-$BASE_VERSION-docker-image-aarch64.tar.gz"
+docker load < "target/kibana-serverless-$BASE_VERSION-docker-image-arm64.tar.gz"
 docker tag "$KIBANA_IMAGE" "$KIBANA_IMAGE-arm64"
 
 echo "--- Push images"

.buildkite/scripts/copy_es_snapshot_cache.sh renamed to .buildkite/scripts/setup_es_snapshot_cache.sh

@@ -2,13 +2,13 @@
 
 set -euo pipefail
 
-# If cached snapshots are baked into the agent, copy them into our workspace first
+# If cached snapshots are baked into the agent, move them into our workspace first
 # We are doing this rather than simply changing the ES base path because many workers
 #   run with the workspace mounted in memory or on a local ssd
 cacheDir="$ES_CACHE_DIR/cache"
 if [[ -d "$cacheDir" ]]; then
   mkdir -p .es/cache
-  echo "--- Copying ES snapshot cache"
-  echo "Copying cached snapshots from $cacheDir to .es/cache"
-  cp -R "$cacheDir"/* .es/cache/
+  echo "--- Move ES snapshot cache"
+  echo "Moving cached snapshots from $cacheDir to .es/cache"
+  mv "$cacheDir"/* .es/cache/
 fi