Merge branch 'main' into fix-ms-defender-runscript-slow-tests

Author: szwarckonrad

.agents/skills/task-manager-registration/SKILL.md

@@ -468,7 +468,6 @@ enabled:
   - x-pack/platform/test/api_integration/apis/kibana/config.ts
   - x-pack/platform/test/api_integration/apis/management/config.ts
   - x-pack/platform/test/api_integration/apis/management/index_management/disabled_data_enrichers/config.ts
-  - x-pack/platform/test/api_integration/apis/lens/config.ts
   - x-pack/platform/test/api_integration/apis/ml/config.ts
   - x-pack/platform/test/api_integration/apis/monitoring/config.ts
   - x-pack/platform/test/api_integration/apis/monitoring_collection/config.ts

.buildkite/ftr_platform_stateful_configs.yml

@@ -111,6 +111,11 @@ async function distributeScoutTestsOnLanes() {
       loadIDsByStepKey[stepKey] = lane.loads;
     });
 
+  if (steps.length === 0) {
+    // Stop early. No test steps to upload. ✨
+    return;
+  }
+
   const bk = new BuildkiteClient();
 
   const lanesGroupStepDependencies: string[] = [];

.buildkite/pipeline-utils/scout/test_distribution_strategies.ts

@@ -52,7 +52,7 @@ steps:
       FTR_GEN_AI_LLM_SAMPLE_SIZE: 'all'
       FTR_CONFIG: 'x-pack/platform/test/agent_builder/smoke_tests/config.stateful.ts'
       FTR_CONFIG_GROUP_KEY: 'ftr-agent-builder-smoke-tests'
-    label: Agent Builder API Smoke Tests
+    label: Agent Builder FTR Smoke Tests
     key: ftr-agent-builder-smoke-tests
     depends_on: discover-eis-models
     timeout_in_minutes: 50
@@ -69,3 +69,32 @@ steps:
           limit: 3
         - exit_status: '*'
           limit: 1
+
+  - command: |
+      mkdir -p target
+      buildkite-agent artifact download 'target/eis_models.json' . --step discover-eis-models || echo '{"models":[]}' > target/eis_models.json
+      .buildkite/scripts/steps/test/scout/configs.sh
+    env:
+      FTR_GEN_AI: '1'
+      FTR_EIS_CCM: '1'
+      FTR_GEN_AI_LLM_SAMPLE_SIZE: 'all'
+      SCOUT_CONFIG: 'x-pack/platform/plugins/shared/agent_builder/test/scout_agent_builder_smoke/api/playwright.config.ts'
+      SCOUT_CONFIG_GROUP_TYPE: 'scout-agent-builder-smoke-tests'
+      SCOUT_SERVER_RUN_FLAGS: '--arch stateful --domain classic'
+    label: Agent Builder Scout Smoke Tests
+    key: scout-agent-builder-smoke-tests
+    depends_on: discover-eis-models
+    timeout_in_minutes: 50
+    parallelism: 1
+    agents:
+      image: family/kibana-ubuntu-2404
+      imageProject: elastic-images-prod
+      provider: gcp
+      machineType: n2-standard-4
+      preemptible: true
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
+        - exit_status: '*'
+          limit: 1

.buildkite/pipelines/agent_builder/smoke_tests.yml

@@ -32,7 +32,7 @@ steps:
           FTR_EIS_CCM: '1'
           FTR_CONFIG: 'x-pack/platform/test/agent_builder/smoke_tests/config.stateful.ts'
           FTR_CONFIG_GROUP_KEY: 'ftr-agent-builder-smoke-tests'
-        label: Agent Builder API Smoke Tests
+        label: Agent Builder FTR Smoke Tests
         key: ftr-agent-builder-smoke-tests
         depends_on: discover-eis-models
         timeout_in_minutes: 50
@@ -47,3 +47,29 @@ steps:
               limit: 3
             - exit_status: '*'
               limit: 1
+
+      - command: |
+          mkdir -p target
+          buildkite-agent artifact download 'target/eis_models.json' . --step discover-eis-models || echo '{"models":[]}' > target/eis_models.json
+          .buildkite/scripts/steps/test/scout/configs.sh
+        env:
+          FTR_GEN_AI: '1'
+          FTR_EIS_CCM: '1'
+          SCOUT_CONFIG: 'x-pack/platform/plugins/shared/agent_builder/test/scout_agent_builder_smoke/api/playwright.config.ts'
+          SCOUT_CONFIG_GROUP_TYPE: 'scout-agent-builder-smoke-tests'
+          SCOUT_SERVER_RUN_FLAGS: '--arch stateful --domain classic'
+        label: Agent Builder Scout Smoke Tests
+        key: scout-agent-builder-smoke-tests
+        depends_on: discover-eis-models
+        timeout_in_minutes: 50
+        parallelism: 1
+        agents:
+          machineType: n2-standard-4
+          preemptible: true
+          spotZones: us-central1-f,us-central1-c,us-central1-a
+        retry:
+          automatic:
+            - exit_status: '-1'
+              limit: 3
+            - exit_status: '*'
+              limit: 1

.buildkite/pipelines/pull_request/agent_builder_smoke_tests.yml

@@ -2,7 +2,8 @@ notify:
   - slack:
       channels:
         - '#kibana-operations-alerts'
-    if: (build.branch == 'main' || build.branch =~ /^[0-9]+\.[0-9x]+\$/) && (build.state == 'passed' || build.state == 'failed')
+    if: (build.branch == 'main' || build.branch =~ /^[0-9]+\.[0-9x]+\$/) &&
+      (build.state == 'passed' || build.state == 'failed')
   - slack:
       channels:
         - '#mission-control'
@@ -30,9 +31,9 @@ steps:
     depends_on: bump-version
     agents:
       image: docker.elastic.co/release-eng/wolfi-build-essential-release-eng:latest
-      cpu: 250m
-      memory: 512Mi
-      ephemeralStorage: 1Gi
+      cpu: 2
+      memory: 4G
+      ephemeralStorage: 10G
     command:
       - echo "Starting DRA artifacts retrieval..."
     timeout_in_minutes: 240

.buildkite/pipelines/version_bump.yml

@@ -5,6 +5,7 @@ plugins:
     - alerting
     - alerting_v2
     - apm
+    - agent_builder
     - automatic_import
     - banners
     - cloud_security_posture
@@ -70,5 +71,6 @@ packages:
 # Define test configs to be excluded from automatic discovery & execution in CI environment (process.env.CI=true)
 excluded_configs:
   - x-pack/solutions/security/plugins/cloud_security_posture/test/scout_cspm_agentless/ui/parallel.playwright.config.ts
+  - x-pack/platform/plugins/shared/agent_builder/test/scout_agent_builder_smoke/api/playwright.config.ts
   - src/platform/plugins/shared/workflows_management/test/scout_workflows_oom_testing/api/playwright.config.ts
   - x-pack/solutions/security/plugins/security_solution/test/scout_cps_local/ui/playwright.config.ts

.buildkite/scout_ci_config.yml

@@ -9,13 +9,17 @@
 
 import fs from 'node:fs';
 import path from 'node:path';
+import { ToolingLog } from '@kbn/tooling-log';
+import { expandWithImplicitConsumers } from './scout_implicit_consumers';
 import {
   getAffectedPackages,
   listChangedFiles,
   touchedCriticalFiles,
   CRITICAL_FILES_SCOUT,
 } from '#pipeline-utils';
 
+const log = new ToolingLog({ level: 'info', writeTo: process.stderr });
+
 const mergeBase = process.env.AFFECTED_MERGE_BASE;
 const outPath = process.env.AFFECTED_MODULES_FILE;
 
@@ -34,11 +38,17 @@ if (!outPath) {
   const changedFiles = listChangedFiles({ mergeBase, commit: 'HEAD' });
 
   // Write affected modules JSON (replaces the list_affected binary call).
-  const affectedPackages = await getAffectedPackages(mergeBase, {
-    strategy: 'git',
-    includeDownstream: true,
-    ignoreUncategorizedChanges: true,
-  });
+  // TEMP: overlay implicit runtime-registry consumers — see scout_implicit_consumers.ts.
+  const affectedPackages = expandWithImplicitConsumers(
+    await getAffectedPackages(mergeBase, {
+      strategy: 'git',
+      includeDownstream: true,
+      ignoreUncategorizedChanges: true,
+    }),
+    changedFiles,
+    log
+  );
+
   const resolvedOutPath = path.resolve(outPath);
   fs.mkdirSync(path.dirname(resolvedOutPath), { recursive: true });
   fs.writeFileSync(resolvedOutPath, JSON.stringify(Array.from(affectedPackages).sort(), null, 2));

.buildkite/scripts/steps/test/scout/configs.sh

@@ -0,0 +1,82 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+/**
+ * TEMPORARY overlay for Scout selective testing.
+ *
+ * The static @kbn/ dependency graph (kibana.jsonc + tsconfig kbn_references)
+ * cannot model runtime registry coupling — e.g. ML registers actions into the
+ * uiActions registry that Dashboard renders at run time, with no static import
+ * edge between them. ML-only changes therefore do not mark Dashboard's Scout
+ * tests as affected and registration races slip through.
+ *
+ * This overlay augments the affected-modules set with a small allowlist of
+ * (patterns -> consumer @kbn/ IDs) entries when the corresponding publisher
+ * files change.
+ */
+
+import minimatch from 'minimatch';
+import type { ToolingLog } from '@kbn/tooling-log';
+
+interface ImplicitConsumerRule {
+  reason: string;
+  patterns: readonly string[];
+  consumers: readonly string[];
+}
+
+const IMPLICIT_REGISTRY_CONSUMERS: readonly ImplicitConsumerRule[] = [
+  {
+    reason: 'Runtime registry coupling not captured by static @kbn/ references.',
+    patterns: [
+      '**/plugins/**/public/embeddables/**/*.{ts,tsx}',
+      '**/plugins/**/public/embeddable/**/*.{ts,tsx}',
+      '**/plugins/**/public/react_embeddable/**/*.{ts,tsx}',
+      '**/plugins/**/public/apps/embeddables/**/*.{ts,tsx}',
+      '**/plugins/**/public/ui_actions/**/*.{ts,tsx}',
+      '**/plugins/**/public/trigger_actions/**/*.{ts,tsx}',
+      '**/plugins/**/public/**/actions/register*.{ts,tsx}',
+    ],
+    consumers: [
+      '@kbn/dashboard-plugin',
+      '@kbn/embeddable-plugin',
+      '@kbn/canvas-plugin',
+      '@kbn/lens-plugin',
+    ],
+  },
+];
+
+/**
+ * Augment an affected-modules set with consumer @kbn/ IDs whose registries are
+ * touched by `changedFiles`. Returns a new Set; never removes entries and
+ * never disables selective testing.
+ */
+export function expandWithImplicitConsumers(
+  affected: ReadonlySet<string>,
+  changedFiles: readonly string[],
+  log: ToolingLog
+): Set<string> {
+  const expanded = new Set(affected);
+
+  for (const rule of IMPLICIT_REGISTRY_CONSUMERS) {
+    const trigger = changedFiles.find((file) =>
+      rule.patterns.some((pattern) => minimatch(file, pattern, { dot: true }))
+    );
+    if (!trigger) continue;
+
+    const added = rule.consumers.filter((id) => !expanded.has(id));
+    if (added.length === 0) continue;
+
+    for (const id of added) expanded.add(id);
+    log.info(
+      `Implicit consumers added: ${added.join(', ')} (triggered by '${trigger}' — ${rule.reason})`
+    );
+  }
+
+  return expanded;
+}