Merge branch 'main' into synthetics-embeddable-schema-registration

Author: yiannisnikolopoulos

.agent/skills/ftr-testing/SKILL.md

@@ -1,5 +1,5 @@
 ---
-name: FTR Testing
+name: ftr-testing
 description: Use when creating, updating, debugging, or reviewing Kibana Functional Test Runner (FTR) tests, including test structure, services/page objects, loadTestFile patterns, tags, and how to run FTR locally.
 ---
 

.agent/skills/scout-api-testing/SKILL.md

@@ -1,5 +1,5 @@
 ---
-name: Scout API Testing
+name: scout-api-testing
 description: Use when creating, updating, debugging, or reviewing Scout API tests in Kibana (apiTest/apiClient/requestAuth/samlAuth/apiServices), including auth choices, response assertions, and API service patterns.
 ---
 

.agent/skills/scout-best-practices-reviewer/SKILL.md

@@ -1,5 +1,5 @@
 ---
-name: Scout Best Practices Reviewer
+name: scout-best-practices-reviewer
 description: Use when writing and reviewing Scout UI and API test files.
 ---
 

.agent/skills/scout-create-scaffold/SKILL.md

@@ -1,5 +1,5 @@
 ---
-name: Scout Create Scaffold
+name: scout-create-scaffold
 description: Generate or repair a Scout test scaffold for a Kibana plugin/package (test/scout*/{api,ui} Playwright configs, fixtures, example specs). Use when you need the initial Scout directory structure; prefer `node scripts/scout.js generate` with flags for non-interactive/LLM execution.
 ---
 

.agent/skills/scout-migrate-from-ftr/SKILL.md

@@ -1,5 +1,5 @@
 ---
-name: Scout Migrate From FTR
+name: scout-migrate-from-ftr
 description: Use when migrating Kibana Functional Test Runner (FTR) tests to Scout, including decisions about UI vs API tests, mapping FTR services/page objects/hooks to Scout fixtures, and splitting loadTestFile patterns.
 ---
 

.agent/skills/scout-ui-testing/SKILL.md

@@ -1,5 +1,5 @@
 ---
-name: Scout UI Testing
+name: scout-ui-testing
 description: Use when creating, updating, debugging, or reviewing Scout UI tests in Kibana (Playwright + Scout fixtures), including page objects, browser authentication, parallel UI tests (spaceTest/scoutSpace), a11y checks, and flake control.
 ---
 

.buildkite/ftr_platform_stateful_configs.yml

@@ -102,7 +102,6 @@ enabled:
   - src/platform/test/functional/apps/kibana_overview/config.ts
   - src/platform/test/functional/apps/management/config.ts
   - src/platform/test/functional/apps/saved_objects_management/config.ts
-  - src/platform/test/functional/apps/sharing/config.ts
   - src/platform/test/functional/apps/status_page/config.ts
   - src/platform/test/functional/apps/visualize/group1/config.ts
   - src/platform/test/functional/apps/visualize/group2/config.ts
@@ -293,7 +292,6 @@ enabled:
   - x-pack/platform/test/functional_cloud/intercepts.config.ts
   - x-pack/platform/test/licensing_plugin/config.public.ts
   - x-pack/platform/test/licensing_plugin/config.ts
-  - x-pack/platform/test/product_intercepts_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
@@ -379,7 +377,6 @@ enabled:
   - x-pack/performance/journeys_e2e/cloud_security_dashboard.ts
   - x-pack/performance/journeys_e2e/apm_service_inventory.ts
   - x-pack/performance/journeys_e2e/infra_hosts_view.ts
-  - x-pack/platform/test/custom_branding/config.ts
   # configs migrated to the new Kibana architecture
   - x-pack/platform/test/api_integration/apis/aiops/config.ts
   - x-pack/platform/test/api_integration/apis/cases/config.ts

.buildkite/pipeline-resource-definitions/kibana-fips-daily.yml

@@ -35,12 +35,6 @@ spec:
           cronline: 0 5 * * * America/New_York
           env:
             TEST_ENABLE_FIPS_VERSION: '140-2'
-        '140-2 Daily build (9.3)':
-          message: 140-2 Daily build
-          branch: '9.3'
-          cronline: 0 5 * * * America/New_York
-          env:
-            TEST_ENABLE_FIPS_VERSION: '140-2'
         '140-2 Daily build (8.19)':
           message: 140-2 Daily build
           branch: '8.19'
@@ -53,12 +47,6 @@ spec:
           cronline: 0 5 * * * America/New_York
           env:
             TEST_ENABLE_FIPS_VERSION: '140-3'
-        '140-3 Daily build (9.3)':
-          message: 140-3 Daily build
-          branch: '9.3'
-          cronline: 0 5 * * * America/New_York
-          env:
-            TEST_ENABLE_FIPS_VERSION: '140-3'
         '140-3 Daily build (8.19)':
           message: 140-3 Daily build
           branch: '8.19'

.buildkite/pipeline-resource-definitions/kibana-uiam-verify-and-promote.yml

@@ -46,9 +46,9 @@ spec:
         kibana-tech-leads:
           access_level: MANAGE_BUILD_AND_READ
       schedules:
-        Weekly build:
-          cronline: 0 9 * * 1 America/New_York
-          message: Weekly build
+        Daily build:
+          cronline: 0 9 * * * America/New_York
+          message: Daily build
           branch: main
       tags:
         - kibana

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

@@ -21,10 +21,38 @@ import type { TestGroupRunOrderResponse } from './client';
 import { CiStatsClient } from './client';
 
 import DISABLED_JEST_CONFIGS from '../../disabled_jest_configs.json';
+import SHARDED_JEST_CONFIGS from '../../sharded_jest_configs.json';
 import { serverless, stateful } from '../../ftr_configs_manifests.json';
 import { filterEmptyJestConfigs } from './get_tests_from_config';
 import { collectEnvFromLabels, expandAgentQueue, getRequiredEnv } from '#pipeline-utils';
 
+const SHARD_ANNOTATION_SEP = '||shard=';
+
+/**
+ * Expands configs that appear in the shard map into N shard-annotated entries.
+ * For example, if `fleet/jest.integration.config.js` has 2 shards, it becomes:
+ *   - `fleet/jest.integration.config.js||shard=1/2`
+ *   - `fleet/jest.integration.config.js||shard=2/2`
+ * Configs not in the shard map are passed through unchanged.
+ */
+function expandShardedJestConfigs(configs: string[]): string[] {
+  const shardMap = SHARDED_JEST_CONFIGS as Record<string, number>;
+  const expanded: string[] = [];
+
+  for (const config of configs) {
+    const shardCount = shardMap[config];
+    if (shardCount && shardCount > 1) {
+      for (let i = 1; i <= shardCount; i++) {
+        expanded.push(`${config}${SHARD_ANNOTATION_SEP}${i}/${shardCount}`);
+      }
+    } else {
+      expanded.push(config);
+    }
+  }
+
+  return expanded;
+}
+
 const ALL_FTR_MANIFEST_REL_PATHS = serverless.concat(stateful);
 
 type RunGroup = TestGroupRunOrderResponse['types'][0];
@@ -45,14 +73,14 @@ export async function pickTestGroupRunOrder() {
 
   const JEST_MAX_MINUTES = process.env.JEST_MAX_MINUTES
     ? parseFloat(process.env.JEST_MAX_MINUTES)
-    : 40;
+    : 35;
   if (Number.isNaN(JEST_MAX_MINUTES)) {
     throw new Error(`invalid JEST_MAX_MINUTES: ${process.env.JEST_MAX_MINUTES}`);
   }
 
   const FUNCTIONAL_MAX_MINUTES = process.env.FUNCTIONAL_MAX_MINUTES
     ? parseFloat(process.env.FUNCTIONAL_MAX_MINUTES)
-    : 37;
+    : 30;
   if (Number.isNaN(FUNCTIONAL_MAX_MINUTES)) {
     throw new Error(`invalid FUNCTIONAL_MAX_MINUTES: ${process.env.FUNCTIONAL_MAX_MINUTES}`);
   }
@@ -167,18 +195,22 @@ export async function pickTestGroupRunOrder() {
         ignore: [...DISABLED_JEST_CONFIGS, '**/node_modules/**'],
       })
     : [];
-  const jestUnitConfigs = await filterEmptyJestConfigs(
+  const jestUnitConfigsFiltered = await filterEmptyJestConfigs(
     jestUnitConfigsWithEmpties,
     os.availableParallelism()
   );
+  // Expand sharded unit configs (e.g. cases/jest.config.js) into shard-annotated entries
+  const jestUnitConfigs = expandShardedJestConfigs(jestUnitConfigsFiltered);
 
-  const jestIntegrationConfigs = LIMIT_CONFIG_TYPE.includes('integration')
-    ? globby.sync(getJestConfigGlobs(['**/jest.integration.config.*js', '!**/__fixtures__/**']), {
+  const jestIntegrationConfigsRaw = LIMIT_CONFIG_TYPE.includes('integration')
+    ? globby.sync(getJestConfigGlobs(['**/jest.integration.config.js', '!**/__fixtures__/**']), {
         cwd: process.cwd(),
         absolute: false,
         ignore: [...DISABLED_JEST_CONFIGS, '**/node_modules/**'],
       })
     : [];
+  // Expand sharded integration configs into shard-annotated entries
+  const jestIntegrationConfigs = expandShardedJestConfigs(jestIntegrationConfigsRaw);
 
   if (!ftrConfigsByQueue.size && !jestUnitConfigs.length && !jestIntegrationConfigs.length) {
     throw new Error('unable to find any unit, integration, or FTR configs');
@@ -357,7 +389,8 @@ export async function pickTestGroupRunOrder() {
             label: 'Jest Integration Tests',
             command: getRequiredEnv('JEST_INTEGRATION_SCRIPT'),
             parallelism: integration.count,
-            timeout_in_minutes: 120,
+            // TODO: Reduce once we have identified the cause of random long-running tests
+            timeout_in_minutes: 75,
             key: 'jest-integration',
             agents: expandAgentQueue('n2-4-spot', 105),
             depends_on: JEST_CONFIGS_DEPS,