Merge branch 'main' into copilot/fix-tooltip-announcement

Author: bhavyarm

.buildkite/package-lock.json

@@ -9,6 +9,7 @@
   },
   "dependencies": {
     "@octokit/rest": "^22.0.1",
+    "@slack/web-api": "^7.0.0",
     "adm-zip": "^0.5.16",
     "axios": "^1.13.4",
     "diff": "^8.0.4",
@@ -41,4 +42,4 @@
     "#pipeline-utils": "./pipeline-utils/index.ts",
     "#pipeline-utils/*": "./pipeline-utils/*"
   }
-}
+}

.buildkite/package.json

@@ -24,6 +24,15 @@ spec:
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/orchestrate_vm_builds.yml
+      initial_step_plugins:
+        - sparse-checkout#v1.6.0:
+            paths:
+              - .buildkite
+              - .node-version
+              - package.json
+              - tsconfig.base.json
+              - versions.json
+            cleanup_sparse_state: true
       provider_settings:
         trigger_mode: none
       teams:

.buildkite/pipeline-resource-definitions/kibana-vm-build-orchestrator.yml

@@ -46,7 +46,7 @@
  * overridable via env vars. `TOO_LONG` triggers a warning annotation when exceeded.
  */
 export const MAX_MINUTES = {
-  JEST_UNIT_DEFAULT: 35, // env: JEST_UNIT_MAX_MINUTES
+  JEST_UNIT_DEFAULT: 30, // env: JEST_UNIT_MAX_MINUTES
   JEST_INTEGRATION_DEFAULT: 30, // env: JEST_INTEGRATION_MAX_MINUTES
   FUNCTIONAL_DEFAULT: 30, // env: FUNCTIONAL_MAX_MINUTES
   TOO_LONG: 27,

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

@@ -16,3 +16,4 @@ export * as TestFailures from './test-failures';
 export * from './utils';
 export * from './pr_labels';
 export * from './scout';
+export * from './version-bump/utils';

.buildkite/pipeline-utils/index.ts

@@ -0,0 +1,45 @@
+/*
+ * 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".
+ */
+
+import type { RestEndpointMethodTypes } from '@octokit/rest';
+import { getPrChangesCached } from '../github';
+
+const VERSION_BUMP_BRANCH_RE = /^bump-versions(-json)?-\d{4}-\d{2}-\d{2}/;
+const KIBANAMACHINE_LOGIN = 'kibanamachine';
+const VERSION_BUMP_FILE_MATCHERS = [
+  /^versions\.json$/,
+  /^\.backportrc\.json$/,
+  /^package\.json$/,
+  /^x-pack\/package\.json$/,
+  /^x-pack\/solutions\/search\/plugins\/enterprise_search\/common\/__mocks__\/initial_app_data\.ts$/,
+  /^src\/core\/server\/integration_tests\/saved_objects\/migrations\/kibana_migrator_archive_utils\.ts$/,
+  /^src\/core\/server\/integration_tests\/saved_objects\/migrations\/archives\//,
+  /^src\/core\/server\/integration_tests\/saved_objects\/migrations\/group1\/__snapshots__\/v2_migration\.test\.ts\.snap$/,
+];
+
+export const isAutomatedVersionBumpPR = async (
+  changes: null | RestEndpointMethodTypes['pulls']['listFiles']['response']['data'] = null
+) => {
+  const branch = process.env.BUILDKITE_BRANCH ?? '';
+  const prHeadUser = process.env.GITHUB_PR_HEAD_USER ?? '';
+
+  if (!VERSION_BUMP_BRANCH_RE.test(branch) || prHeadUser !== KIBANAMACHINE_LOGIN) {
+    return false;
+  }
+
+  const prChanges = changes || (await getPrChangesCached());
+
+  return prChanges.every((change) =>
+    VERSION_BUMP_FILE_MATCHERS.some(
+      (pattern) =>
+        change.filename.match(pattern) &&
+        (!change.previous_filename || change.previous_filename.match(pattern))
+    )
+  );
+};

.buildkite/pipeline-utils/version-bump/utils.ts

@@ -14,6 +14,7 @@ steps:
         required: true
 
   - name: 'Upload trigger steps'
+    checkout: none
     command: |
       VM_IMAGES_BRANCH="$$(buildkite-agent meta-data get "VM_IMAGES_BRANCH")"
       KIBANA_BRANCH="$$(buildkite-agent meta-data get "KIBANA_BRANCH")"

.buildkite/pipelines/orchestrate_vm_builds.yml

@@ -55,3 +55,23 @@ steps:
           field: '.version'
           expected_value: '${NEW_VERSION}-SNAPSHOT'
           polling_interval: '30'
+
+  - wait
+
+  - name: 'slack notification'
+    command: .buildkite/scripts/steps/version_bump/slack_notify.sh
+    soft_fail: true
+    agents:
+      image: family/kibana-ubuntu-2404
+      imageProject: elastic-images-prod
+      provider: gcp
+      machineType: n2-standard-4
+
+  - key: verify-es-snapshot
+    label: 'Verify ES Snapshot'
+    trigger: kibana-elasticsearch-snapshot-verify
+    async: true
+    soft_fail: true
+    if: build.env("DRY_RUN") != "true"
+    build:
+      branch: $BRANCH

.buildkite/pipelines/version_bump.yml

@@ -12,17 +12,24 @@ import { FIPS_GH_LABELS, FIPS_VERSION } from '#pipeline-utils/pr_labels';
 
 const mockAreChangesSkippable = jest.fn();
 const mockDoAnyChangesMatch = jest.fn();
+const mockDoAllChangesMatch = jest.fn();
 const mockGetAgentImageConfig = jest.fn();
+const mockFlushCancelOnGateFailureMetadata = jest.fn();
 const mockRunPreBuild = jest.fn();
 const mockGetEvalPipeline = jest.fn();
+const mockIsAutomatedVersionBumpPR = jest.fn();
 
 jest.mock('#pipeline-utils', () => {
   const actual = jest.requireActual('#pipeline-utils');
   return {
     ...actual,
+    getKibanaDir: jest.fn().mockReturnValue('/kibana'),
     areChangesSkippable: mockAreChangesSkippable,
     doAnyChangesMatch: mockDoAnyChangesMatch,
+    doAllChangesMatch: mockDoAllChangesMatch,
     getAgentImageConfig: mockGetAgentImageConfig,
+    flushCancelOnGateFailureMetadata: mockFlushCancelOnGateFailureMetadata,
+    isAutomatedVersionBumpPR: mockIsAutomatedVersionBumpPR,
   };
 });
 
@@ -60,7 +67,7 @@ const waitForExit = () => {
 
 describe('pull_request pipeline generation', () => {
   beforeEach(() => {
-    jest.clearAllMocks();
+    jest.resetAllMocks();
     jest.resetModules();
     process.env = { ...ORIGINAL_ENV };
 
@@ -69,9 +76,11 @@ describe('pull_request pipeline generation', () => {
 
     mockAreChangesSkippable.mockResolvedValue(false);
     mockDoAnyChangesMatch.mockResolvedValue(false);
+    mockDoAllChangesMatch.mockResolvedValue(false);
     mockGetAgentImageConfig.mockReturnValue('agents:\n  provider: gcp\n');
     mockRunPreBuild.mockResolvedValue(undefined);
     mockGetEvalPipeline.mockReturnValue(null);
+    mockIsAutomatedVersionBumpPR.mockResolvedValue(false);
   });
 
   afterEach(() => {
@@ -95,7 +104,7 @@ describe('pull_request pipeline generation', () => {
   });
 
   it('emits valid renovate-only pipeline and skips pre-build', async () => {
-    mockAreChangesSkippable.mockResolvedValueOnce(false).mockResolvedValueOnce(true);
+    mockDoAllChangesMatch.mockResolvedValueOnce(true);
     const warnSpy = jest.spyOn(console, 'warn').mockImplementation();
     const emitted = waitForEmission();
 
@@ -164,4 +173,17 @@ describe('pull_request pipeline generation', () => {
       expect.any(Error)
     );
   });
+
+  it('emits empty pipeline for automated version bump PRs from kibanamachine', async () => {
+    mockIsAutomatedVersionBumpPR.mockResolvedValueOnce(true);
+    const emitted = waitForEmission();
+
+    await importPipelineModule();
+    const output = await emitted;
+
+    const parsed = yamlLoad(output) as Record<string, unknown>;
+    expect(parsed).toEqual({ steps: [] });
+    expect(mockRunPreBuild).not.toHaveBeenCalled();
+    expect(mockAreChangesSkippable).not.toHaveBeenCalled();
+  });
 });