Merge remote-tracking branch 'upstream/main' into feature/pkg-subscri…

…ption

.buildkite/ftr_configs.yml

@@ -45,8 +45,6 @@ disabled:
   - x-pack/plugins/observability/e2e/synthetics_run.ts
 
   # Configs that exist but weren't running in CI when this file was introduced
-  - test/visual_regression/config.ts
-  - x-pack/test/visual_regression/config.ts
   - x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/config.ts
   - x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/telemetry/config.ts
   - x-pack/test/alerting_api_integration/spaces_only_legacy/config.ts
@@ -58,6 +56,9 @@ disabled:
   - x-pack/test/screenshot_creation/config.ts
   - x-pack/test/fleet_packages/config.ts
 
+  # Scalability testing config that we run in its own pipeline
+  - x-pack/test/performance/scalability/config.ts
+
 defaultQueue: 'n2-4-spot'
 enabled:
   - test/accessibility/config.ts
@@ -117,6 +118,7 @@ enabled:
   - x-pack/test/alerting_api_integration/basic/config.ts
   - x-pack/test/alerting_api_integration/security_and_spaces/group1/config.ts
   - x-pack/test/alerting_api_integration/security_and_spaces/group2/config.ts
+  - x-pack/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts
   - x-pack/test/alerting_api_integration/spaces_only/config.ts
   - x-pack/test/api_integration_basic/config.ts
   - x-pack/test/api_integration/config_security_basic.ts
@@ -138,6 +140,7 @@ enabled:
   - x-pack/test/detection_engine_api_integration/security_and_spaces/group7/config.ts
   - x-pack/test/detection_engine_api_integration/security_and_spaces/group8/config.ts
   - x-pack/test/detection_engine_api_integration/security_and_spaces/group9/config.ts
+  - x-pack/test/detection_engine_api_integration/security_and_spaces/group10/config.ts
   - x-pack/test/encrypted_saved_objects_api_integration/config.ts
   - x-pack/test/endpoint_api_integration_no_ingest/config.ts
   - x-pack/test/examples/config.ts
@@ -151,6 +154,7 @@ enabled:
   - x-pack/test/functional_synthetics/config.js
   - x-pack/test/functional_with_es_ssl/config.ts
   - x-pack/test/functional/apps/advanced_settings/config.ts
+  - x-pack/test/functional/apps/aiops/config.ts
   - x-pack/test/functional/apps/api_keys/config.ts
   - x-pack/test/functional/apps/apm/config.ts
   - x-pack/test/functional/apps/canvas/config.ts
@@ -178,7 +182,9 @@ enabled:
   - 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/test/functional/apps/ml/anomaly_detection/config.ts
+  - x-pack/test/functional/apps/ml/anomaly_detection_jobs/config.ts
+  - x-pack/test/functional/apps/ml/anomaly_detection_integrations/config.ts
+  - x-pack/test/functional/apps/ml/anomaly_detection_result_views/config.ts
   - x-pack/test/functional/apps/ml/data_frame_analytics/config.ts
   - x-pack/test/functional/apps/ml/data_visualizer/config.ts
   - x-pack/test/functional/apps/ml/permissions/config.ts
@@ -249,6 +255,7 @@ enabled:
   - x-pack/test/security_functional/oidc.config.ts
   - x-pack/test/security_functional/saml.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_solution_endpoint_api_int/config.ts
   - x-pack/test/security_solution_endpoint/config.ts
   - x-pack/test/session_view/basic/config.ts
@@ -266,3 +273,4 @@ enabled:
   - x-pack/test/performance/journeys/many_fields_discover/config.ts
   - x-pack/test/performance/journeys/promotion_tracking_dashboard/config.ts
   - x-pack/test/performance/journeys/web_logs_dashboard/config.ts
+  - x-pack/test/performance/journeys/data_stress_test_lens/config.ts

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

@@ -84,6 +84,9 @@ export class CiStatsClient {
         jenkinsJobId: process.env.BUILDKITE_BUILD_NUMBER,
         jenkinsUrl: process.env.BUILDKITE_BUILD_URL,
         prId: process.env.GITHUB_PR_NUMBER || null,
+        backfillJobIds: process.env.KIBANA_REUSABLE_BUILD_JOB_ID
+          ? [process.env.KIBANA_REUSABLE_BUILD_JOB_ID]
+          : [],
       },
     });
 
@@ -132,13 +135,12 @@ export class CiStatsClient {
     });
   };
 
-  getPrReport = async (buildId: string, backfillJobIds: string[] = []) => {
+  getPrReport = async (buildId: string) => {
     const resp = await this.request<CiStatsPrReport>({
-      path: `v3/pr_report`,
-      method: 'post',
-      body: {
+      method: 'GET',
+      path: `v2/pr_report`,
+      params: {
         buildId,
-        backfillJobIds,
       },
     });
 

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

@@ -26,12 +26,7 @@ export async function onComplete() {
     return;
   }
 
-  const backfillJobIds: string[] = [];
-  if (process.env.KIBANA_REUSABLE_BUILD_JOB_ID) {
-    backfillJobIds.push(process.env.KIBANA_REUSABLE_BUILD_JOB_ID);
-  }
-
-  const report = await ciStats.getPrReport(process.env.CI_STATS_BUILD_ID, backfillJobIds);
+  const report = await ciStats.getPrReport(process.env.CI_STATS_BUILD_ID);
   if (report?.md) {
     buildkite.setMetadata('pr_comment:ci_stats_report:body', report.md);
 

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

@@ -161,7 +161,7 @@ export async function pickTestGroupRunOrder() {
 
   const JEST_MAX_MINUTES = process.env.JEST_MAX_MINUTES
     ? parseFloat(process.env.JEST_MAX_MINUTES)
-    : 50;
+    : 40;
   if (Number.isNaN(JEST_MAX_MINUTES)) {
     throw new Error(`invalid JEST_MAX_MINUTES: ${process.env.JEST_MAX_MINUTES}`);
   }

.buildkite/pipeline-utils/test-failures/annotate.ts

@@ -150,7 +150,7 @@ export const annotateTestFailures = async () => {
   }
 
   exec(
-    `buildkite-agent artifact download --include-retried-jobs "target/test_failures/*.json" "${failureDir}"`
+    `.buildkite/scripts/common/download_artifact.sh --include-retried-jobs "target/test_failures/*.json" "${failureDir}"`
   );
 
   const failures: TestFailure[] = recursiveReadDir(failureDir)

.buildkite/pipelines/artifacts.yml

@@ -73,13 +73,23 @@ steps:
 
   - command: .buildkite/scripts/steps/artifacts/cloud.sh
     label: 'Cloud Deployment'
-    soft_fail: true
+    soft_fail:
+      - exit_status: 255
     agents:
       queue: n2-2
     timeout_in_minutes: 30
     if: "build.env('RELEASE_BUILD') == null || build.env('RELEASE_BUILD') == '' || build.env('RELEASE_BUILD') == 'false'"
     retry:
       automatic:
+        # Timeout and graceful shutdown | ecctl deployment create falure
+        - exit_status: 255
+          limit: 0
+
+        # Timeout and forced shutdown
+        - exit_status: '-1'
+          limit: 0
+
+        # Test failures
         - exit_status: '*'
           limit: 1
 

.buildkite/pipelines/bazel_cache.yml

@@ -26,10 +26,18 @@ steps:
         concurrency_group: bazel_macos
         concurrency: 1
         concurrency_method: eager
+        retry:
+          automatic:
+          - exit_status: '*'
+            limit: 1
       - command: .buildkite/scripts/steps/bazel_cache/bootstrap_mac.sh
         label: Bootstrap (MacOS ARM)
         priority: $${PRIORITY}
         agents:
           queue: macos-arm
         timeout_in_minutes: 60
+        retry:
+          automatic:
+          - exit_status: '*'
+            limit: 1
       YAML

.buildkite/pipelines/es_snapshots/verify.yml

@@ -22,10 +22,14 @@ steps:
   - command: .buildkite/scripts/steps/build_kibana.sh
     label: Build Kibana Distribution and Plugins
     agents:
-      queue: c2-16
+      queue: n2-16-spot
     key: build
     if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
     timeout_in_minutes: 60
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
 
   - command: .buildkite/scripts/steps/test/pick_test_group_run_order.sh
     label: 'Pick Test Group Run Order'

.buildkite/pipelines/on_merge.yml

@@ -31,7 +31,7 @@ steps:
   - command: .buildkite/scripts/steps/on_merge_build_and_metrics.sh
     label: Build Kibana Distribution and Plugins
     agents:
-      queue: c2-16
+      queue: n2-16-spot
     key: build
     timeout_in_minutes: 60
     retry:
@@ -43,10 +43,12 @@ steps:
     label: Build TS Refs and Check Public API Docs
     key: public-api-docs
     agents:
-      queue: c2-4
+      queue: n2-4-spot
     timeout_in_minutes: 80
     retry:
       automatic:
+        - exit_status: '-1'
+          limit: 3
         - exit_status: '*'
           limit: 1
 
@@ -90,9 +92,13 @@ steps:
   - command: .buildkite/scripts/steps/lint_with_types.sh
     label: 'Linting (with types)'
     agents:
-      queue: c2-16
+      queue: n2-16-spot
     key: linting_with_types
     timeout_in_minutes: 90
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
 
   - command: .buildkite/scripts/steps/checks.sh
     label: 'Checks'
@@ -107,8 +113,12 @@ steps:
   - command: .buildkite/scripts/steps/check_types.sh
     label: 'Check Types'
     agents:
-      queue: c2-8
+      queue: n2-16-spot
     timeout_in_minutes: 60
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
 
   - command: .buildkite/scripts/steps/storybooks/build_and_upload.sh
     label: 'Build Storybooks'
@@ -125,7 +135,7 @@ steps:
     label: 'Populate local dev bazel cache (Linux)'
     agents:
       queue: n2-4-spot
-    timeout_in_minutes: 15
+    timeout_in_minutes: 30
     retry:
       automatic:
         - exit_status: '-1'

.buildkite/pipelines/performance/daily.yml

@@ -11,13 +11,15 @@ steps:
     agents:
       queue: c2-16
     key: build
+    if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
 
   - label: ':muscle: Performance Tests with Playwright config'
     command: .buildkite/scripts/steps/functional/performance_playwright.sh
     agents:
       queue: kb-static-ubuntu
     depends_on: build
     key: tests
+    timeout_in_minutes: 60
 
   - label: ':shipit: Performance Tests dataset extraction for scalability benchmarking'
     command: .buildkite/scripts/steps/functional/scalability_dataset_extraction.sh