Implement automated version bump pipeline for patch and minor releases

.buildkite/pipelines/version_bump.yml

@@ -16,19 +16,19 @@ notify:
         Workflow: `${WORKFLOW}`
         ${BUILDKITE_BUILD_URL}
     if: build.state == "blocked"
+  - slack:
+      channels:
+        - '#mission-control'
+      message: |
+        Kibana has been bumped to `${NEW_VERSION}` on branch `${BRANCH}` and a DRA build has begun.
+        Build: ${BUILDKITE_BUILD_URL}
+    if: build.state == "passed"
 
 steps:
-  # TODO: replace this block step by real version bump logic
-  - block: 'Ready to fetch for DRA artifacts?'
-    prompt: |
-      Unblock when your team is ready to proceed.
+  - command: .buildkite/scripts/version_bump/bump.sh
+    label: Bump version
 
-      Trigger parameters:
-      - NEW_VERSION: ${NEW_VERSION}
-      - BRANCH: ${BRANCH}
-      - WORKFLOW: ${WORKFLOW}
-    key: block-get-dra-artifacts
-    blocked_state: running
+  - wait
 
   - label: 'Fetch DRA Artifacts'
     key: fetch-dra-artifacts

.buildkite/pipelines/version_bump/bump_package_json_versions.yml

@@ -0,0 +1,11 @@
+steps:
+  - name: 'Bump package.json versions'
+    key: bump-package-json-versions
+    command: .buildkite/scripts/steps/version_bump/bump_package_json_versions.sh
+    agents:
+      image: family/kibana-ubuntu-2404
+      imageProject: elastic-images-prod
+      provider: gcp
+      machineType: n4-standard-4
+      preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-a

.buildkite/pipelines/version_bump/bump_package_json_versions_to_main.yml

@@ -0,0 +1,13 @@
+steps:
+  - name: 'Bump package.json versions (to main)'
+    key: bump-package-json-versions-to-main
+    command: .buildkite/scripts/steps/version_bump/bump_package_json_versions.sh
+    env:
+      OVERRIDE_BRANCH: main
+    agents:
+      image: family/kibana-ubuntu-2404
+      imageProject: elastic-images-prod
+      provider: gcp
+      machineType: n4-standard-4
+      preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-a

.buildkite/pipelines/version_bump/bump_versions_json.yml

@@ -0,0 +1,11 @@
+steps:
+  - name: 'Bump versions.json'
+    key: bump-versions-json
+    command: .buildkite/scripts/steps/version_bump/bump_versions_json.sh
+    agents:
+      image: family/kibana-ubuntu-2404
+      imageProject: elastic-images-prod
+      provider: gcp
+      machineType: n4-standard-4
+      preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-a

.buildkite/pipelines/version_bump/create_new_branch.yml

@@ -0,0 +1,4 @@
+steps:
+  - name: 'Create new release branch'
+    key: create-new-branch
+    command: .buildkite/scripts/steps/version_bump/create_new_branch_of_main.sh

.buildkite/pipelines/version_bump/ensure_version_label.yml

@@ -0,0 +1,4 @@
+steps:
+  - name: 'Ensure version label exists'
+    key: ensure-version-label
+    command: .buildkite/scripts/steps/version_bump/ensure_version_label.sh

.buildkite/pipelines/version_bump/notify_branch_created.yml

@@ -0,0 +1,4 @@
+steps:
+  - name: 'Notify Slack: branch created'
+    key: notify-branch-created
+    command: .buildkite/scripts/steps/version_bump/notify_branch_created.sh

.buildkite/pipelines/version_bump/reconcile_pr_labels.yml

@@ -0,0 +1,4 @@
+steps:
+  - name: 'Reconcile PR Labels'
+    key: reconcile-pr-labels
+    command: .buildkite/scripts/steps/version_bump/reconcile_pr_labels.sh

.buildkite/pipelines/version_bump/trigger_dra_snapshot.yml

@@ -0,0 +1,7 @@
+steps:
+  - name: Trigger DRA Snapshot Build
+    key: trigger-dra-snapshot
+    trigger: kibana-artifacts-snapshot
+    async: false
+    build:
+      branch: 'main'

.buildkite/pipelines/version_bump/trigger_dra_staging.yml

@@ -0,0 +1,7 @@
+steps:
+  - name: Trigger DRA Staging Build
+    key: trigger-dra-staging
+    trigger: kibana-artifacts-staging
+    async: false
+    build:
+      branch: 'main'

.buildkite/pipelines/version_bump/trigger_es_build_and_promote.yml

@@ -0,0 +1,26 @@
+steps:
+  # run the bash files directly and only run the build and promote, because verify will fail.
+  # TODO: Ask @alex if this would work, especially because the meta data get happens in two separate bash files.
+
+  # Step 1: Run the ES Snapshot Build
+  - command: .buildkite/scripts/steps/es_snapshots/build.sh
+    label: Build ES Snapshot
+    timeout_in_minutes: 30
+    agents:
+      image: family/kibana-ubuntu-2404
+      imageProject: elastic-images-prod
+      provider: gcp
+      localSsds: 1
+      localSsdInterface: nvme
+      machineType: c2-standard-8
+      diskSizeGb: 130
+
+  # Step 2: Run the ES Promote
+  - label: Promote Snapshot
+    command: .buildkite/scripts/steps/es_snapshots/promote.sh
+    depends_on: build-es-snapshot
+    agents:
+      image: family/kibana-ubuntu-2404
+      imageProject: elastic-images-prod
+      provider: gcp
+      machineType: n2-standard-2

.buildkite/pipelines/version_bump/update_label_color.yml

@@ -0,0 +1,11 @@
+steps:
+  - name: 'Update Label Color'
+    key: update-label-color
+    command: .buildkite/scripts/steps/version_bump/update_label_color.sh
+    agents:
+      image: family/kibana-ubuntu-2404
+      imageProject: elastic-images-prod
+      provider: gcp
+      machineType: n4-standard-4
+      preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-a

.buildkite/pipelines/version_bump/update_pipeline_resource_definitions.yml

@@ -0,0 +1,11 @@
+steps:
+  - name: 'Update pipeline resource definitions'
+    key: update-pipeline-resource-definitions
+    command: .buildkite/scripts/steps/version_bump/update_pipeline_resource_definitions.sh
+    agents:
+      image: family/kibana-ubuntu-2404
+      imageProject: elastic-images-prod
+      provider: gcp
+      machineType: n4-standard-4
+      preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-a

.buildkite/pipelines/version_bump/update_release_branch.yml

@@ -0,0 +1,4 @@
+steps:
+  - name: 'Update release branch config'
+    key: update-release-branch
+    command: .buildkite/scripts/steps/version_bump/update_release_branch.sh

.buildkite/scripts/steps/version_bump/bump.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+# TODO: If the logic is simple within the piplein.ts file, then remove that layer of abstraction.
+ts-node .buildkite/scripts/version_bump/pipeline.ts | buildkite-agent pipeline upload
+

.buildkite/scripts/steps/version_bump/bump_package_json_versions.sh

@@ -0,0 +1,77 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source "$(dirname "$0")/wait_for_pr_merge.sh"
+
+branch_to_merge_into="${OVERRIDE_BRANCH:-$BRANCH}"
+
+old_version=""
+store_old_version() {
+  old_version=$(jq -r '.version' package.json)
+  echo "Current version: $old_version"
+  echo "New version: $NEW_VERSION"
+
+  buildkite-agent meta-data set "OLD_VERSION" "$old_version"
+}
+
+update_package_json_version() {
+  echo --- Bump package.json versions
+  sed -i "s/\"version\": \"[0-9]\+\.[0-9]\+\.[0-9]\+\"/\"version\": \"${NEW_VERSION}\"/g" package.json
+  sed -i "s/\"version\": \"[0-9]\+\.[0-9]\+\.[0-9]\+\"/\"version\": \"${NEW_VERSION}\"/g" x-pack/package.json
+}
+
+update_initial_app_data() {
+  echo --- Bump initial_app_data kibanaVersion
+  local target="x-pack/solutions/search/plugins/enterprise_search/common/__mocks__/initial_app_data.ts"
+  sed -i "s/kibanaVersion: '[0-9]\+\.[0-9]\+\.[0-9]\+'/kibanaVersion: '${NEW_VERSION}'/" "$target"
+}
+
+update_kibana_migrator_utils() {
+  echo --- Bump BASELINE_ELASTICSEARCH_VERSION
+  local target="src/core/server/integration_tests/saved_objects/migrations/kibana_migrator_archive_utils.ts"
+  sed -i "s/BASELINE_ELASTICSEARCH_VERSION = '[0-9]\+\.[0-9]\+\.[0-9]\+'/BASELINE_ELASTICSEARCH_VERSION = '${NEW_VERSION}'/" "$target"
+}
+
+delete_baseline_archives() {
+  echo --- Deleting baseline archives
+  local archive_dir="src/core/server/integration_tests/saved_objects/migrations/archives"
+  find "$archive_dir" -type f -name "${old_version}_baseline_*.zip" -delete
+}
+
+store_old_version
+
+update_package_json_version
+
+# If branch is 8.19, skip updating initial_app_data
+if [[ "$BRANCH" != "8.19" ]]; then
+  update_initial_app_data
+fi
+
+update_kibana_migrator_utils
+
+delete_baseline_archives
+
+# Run integration tests to update snapshots
+node scripts/jest_integration.js -u src/core/server/integration_tests/saved_objects/migrations/group1/create_test_archives.test.ts
+node scripts/jest_integration.js -u src/core/server/integration_tests/saved_objects/migrations/group1/v2_migration.test.ts
+
+
+echo --- Committing version bump changes
+git config --global user.name kibanamachine
+git config --global user.email '42973632+kibanamachine@users.noreply.github.com'
+
+head_branch="bump-versions-$(date +%F_%H-%M-%S)"
+git checkout -b "$head_branch"
+git add 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
+git commit -m "[version bump] Bump version to ${NEW_VERSION}"
+git push origin "$branch"
+
+prUrl=$(gh pr create --repo elastic/kibana --base "$branch_to_merge_into" --head "$head_branch" --title "[bump version] $(date +%F) Bump package.json versions to ${NEW_VERSION}" --body "Generated by $BUILDKITE_BUILD_URL" --label "release_note:skip" --label "backport:skip")
+echo "Opened PR: $prUrl"
+
+gh pr merge --repo elastic/kibana --auto --squash --delete-branch "$prUrl"
+
+wait_for_pr_merge "$prUrl"
+
+

.buildkite/scripts/steps/version_bump/bump_versions_json.sh

@@ -0,0 +1,124 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source "$(dirname "$0")/wait_for_pr_merge.sh"
+
+# Always target main, even when the pipeline runs on another branch
+git fetch origin main
+git checkout main
+
+# --- Functions ---
+
+update_patch_versions_json() {
+  echo "Patch bump: updating version for branch '$BRANCH' to '$NEW_VERSION'"
+
+  jq --arg version "$NEW_VERSION" --arg branch "$BRANCH" \
+    '(.versions[] | select(.branch == $branch)).version = $version' \
+    versions.json > versions.json.tmp && mv versions.json.tmp versions.json
+}
+
+update_minor_versions_json() {
+  local major minor next_minor
+
+  major=$(echo "$NEW_VERSION" | cut -d. -f1)
+  minor=$(echo "$NEW_VERSION" | cut -d. -f2)
+  next_minor=$((minor + 1))
+  NEXT_DEV_VERSION="${major}.${next_minor}.0"
+
+  echo "Minor bump: adding branch '$BRANCH' with version '$NEW_VERSION'"
+  echo "Next dev version for main: $NEXT_DEV_VERSION"
+
+  # 1. Bump main's version to the next dev version
+  jq --arg nextVersion "$NEXT_DEV_VERSION" \
+    '(.versions[] | select(.branch == "main")).version = $nextVersion' \
+    versions.json > versions.json.tmp && mv versions.json.tmp versions.json
+
+  # 2. Insert a new release entry for the new branch (after main)
+  jq --arg version "$NEW_VERSION" --arg branch "$BRANCH" \
+    '.versions |= [.[0]] + [{"version": $version, "branch": $branch, "branchType": "release"}] + .[1:]' \
+    versions.json > versions.json.tmp && mv versions.json.tmp versions.json
+
+  # 3. Prune oldest same-major minor if there are more than 2 release entries for this major
+  local same_major_count
+  same_major_count=$(jq --arg major "$major" \
+    '[.versions[] | select(.branchType == "release" and (.branch | startswith($major + ".")))] | length' \
+    versions.json)
+
+  if [ "$same_major_count" -gt 2 ]; then
+    echo "Found $same_major_count release entries for major $major, pruning oldest"
+
+    local oldest_branch
+    oldest_branch=$(jq -r --arg major "$major" \
+      '[.versions[] | select(.branchType == "release" and (.branch | startswith($major + ".")))]
+       | sort_by(.branch | split(".")[1] | tonumber)
+       | .[0].branch' \
+      versions.json)
+
+    echo "Removing oldest branch: $oldest_branch"
+
+    jq --arg oldBranch "$oldest_branch" \
+      '.versions |= map(select(.branch != $oldBranch))' \
+      versions.json > versions.json.tmp && mv versions.json.tmp versions.json
+  fi
+}
+
+update_backportrc_json() {
+  # 1. Add the new branch to targetBranchChoices right after "main"
+  jq --arg branch "$BRANCH" \
+    '.targetBranchChoices |= [.[0]] + [$branch] + .[1:]' \
+    .backportrc.json > .backportrc.json.tmp && mv .backportrc.json.tmp .backportrc.json
+
+  # 2. Update branchLabelMapping: replace the old main version pattern with the next dev version
+  #    Match the key that maps to "main" and looks like "^v9.4.0$" (not the generic regex pattern)
+  jq --arg nextVersion "$NEXT_DEV_VERSION" \
+    '.branchLabelMapping |= with_entries(
+      if .value == "main" and (.key | startswith("^v")) and (.key | endswith("$")) and (.key | contains("(") | not)
+      then .key = ("^v" + $nextVersion + "$")
+      else .
+      end
+    )' \
+    .backportrc.json > .backportrc.json.tmp && mv .backportrc.json.tmp .backportrc.json
+}
+
+# --- Main ---
+
+echo --- Bump versions.json versions
+
+FILES_TO_COMMIT="versions.json"
+
+if [ "$WORKFLOW" = "patch" ]; then
+  update_patch_versions_json
+
+elif [ "$WORKFLOW" = "minor" ]; then
+  update_minor_versions_json
+  update_backportrc_json
+  FILES_TO_COMMIT="versions.json .backportrc.json"
+
+else
+  echo "Error: Unknown WORKFLOW '$WORKFLOW'. Expected 'patch' or 'minor'."
+  exit 1
+fi
+
+echo "Updated versions.json successfully"
+cat versions.json
+
+echo --- Committing version bump changes
+
+git config --global user.name kibanamachine
+git config --global user.email '42973632+kibanamachine@users.noreply.github.com'
+
+branch="bump-versions-json$(date +%F_%H-%M-%S)"
+git checkout -b "$branch"
+git add $FILES_TO_COMMIT
+git commit -m "[versions.json bump] Bump versions.json to ${NEW_VERSION}"
+
+git push origin "$branch"
+
+prUrl=$(gh pr create --repo elastic/kibana --base main --head "$branch" --title "[Auto version bump] $(date +%F) Bump versions.json to ${NEW_VERSION}" --body "Generated by $BUILDKITE_BUILD_URL" --label "release_note:skip" --label "backport:skip")
+echo "Opened PR: $prUrl"
+
+gh pr merge --repo elastic/kibana --auto --squash --delete-branch "$prUrl"
+
+wait_for_pr_merge "$prUrl"
+

.buildkite/scripts/steps/version_bump/create_new_branch_of_main.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+echo --- Create new branch off main
+
+echo "Creating branch '$BRANCH' from main"
+
+git config --global user.name kibanamachine
+git config --global user.email '42973632+kibanamachine@users.noreply.github.com'
+
+git checkout main
+git checkout -b "$BRANCH"
+git push origin "$BRANCH"
+
+echo "Branch '$BRANCH' created and pushed to origin"