From ff36c03b868941e38791d23aed09144d8c5410a2 Mon Sep 17 00:00:00 2001
From: Nina Lee <nina.lee@elastic.co>
Date: Thu, 23 Jul 2026 12:53:32 -0500
Subject: [PATCH] ci: add main-branch DRA check for minor version-bump workflow

Adds a generate-master-dra-check step (minor workflow only) that
computes the next minor version and dynamically uploads a
fetch-master-dra-artifacts step to poll master.json for
{major}.{minor+1}.0-SNAPSHOT, confirming the main branch DRA
build has picked up the new version.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .buildkite/version_bump_pipeline.yml | 47 ++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/.buildkite/version_bump_pipeline.yml b/.buildkite/version_bump_pipeline.yml
index 4ff01db1c3..3e9e34f931 100644
--- a/.buildkite/version_bump_pipeline.yml
+++ b/.buildkite/version_bump_pipeline.yml
@@ -74,3 +74,50 @@ steps:
           field: ".version"
           expected_value: "${NEW_VERSION}-SNAPSHOT"
           polling_interval: "30"
+
+  - label: "Generate Fetch master DRA Artifacts step"
+    key: generate-master-dra-check
+    if: build.env("WORKFLOW") == "minor"
+    depends_on: fetch-dra-artifacts
+    agents:
+      image: docker.elastic.co/release-eng/wolfi-build-essential-release-eng:latest
+      cpu: 250m
+      memory: 512Mi
+      ephemeralStorage: 1Gi
+    command: |
+      IFS='.' read -r major minor patch <<EOF
+      $${NEW_VERSION}
+      EOF
+      for part in "$$major" "$$minor" "$$patch"; do
+        case "$$part" in
+          ''|*[!0-9]*) echo "ERROR: NEW_VERSION must be MAJOR.MINOR.PATCH, got $${NEW_VERSION}" >&2; exit 1 ;;
+        esac
+      done
+      next_main="$$major.$$((minor + 1)).0"
+      echo "Waiting for $$next_main-SNAPSHOT on master"
+      cat <<EOF | buildkite-agent pipeline upload
+      steps:
+        - label: "Fetch master DRA Artifacts"
+          key: fetch-master-dra-artifacts
+          depends_on: generate-master-dra-check
+          agents:
+            image: docker.elastic.co/release-eng/wolfi-build-essential-release-eng:latest
+            cpu: 250m
+            memory: 512Mi
+            ephemeralStorage: 1Gi
+          command:
+            - echo "Polling $$next_main-SNAPSHOT on master..."
+          timeout_in_minutes: 240
+          retry:
+            automatic:
+              - exit_status: "*"
+                limit: 2
+            manual:
+              permit_on_passed: true
+          plugins:
+            - elastic/json-watcher#v1.0.0:
+                url: "https://storage.googleapis.com/elastic-artifacts-snapshot/logstash/latest/master.json"
+                field: ".version"
+                expected_value: "$$next_main-SNAPSHOT"
+                polling_interval: "30"
+      EOF