From d8df424850cda84f1da5023832f81cb267870379 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 24 Mar 2026 16:35:25 +0100 Subject: [PATCH 1/5] dra: support bumping releases minor/patch using the existing tools --- .buildkite/version_bump_pipeline.yml | 31 +++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/.buildkite/version_bump_pipeline.yml b/.buildkite/version_bump_pipeline.yml index c91afb6ced..fd7b40d1d9 100644 --- a/.buildkite/version_bump_pipeline.yml +++ b/.buildkite/version_bump_pipeline.yml @@ -18,7 +18,36 @@ notify: if: build.state == "blocked" steps: - # TODO: replace this block step by real version bump logic + - label: "Bump version minor" + # NOTE: a new minor is X.Y.0, so we check if the version ends with 0 + # to decide if it's a minor or patch release + if: build.env("NEW_VERSION") !~ /0$/ + plugins: + - elastic/vault-github-token#v0.1.0: + - elastic/gh-cli#v0.1.0: + version: "2.62.0" + wait: true + workflow-file: "version_bumps.yml" + workflow-ref: "main" + workflow-inputs: + branch: "${BRANCH}" + bump: "minor" + + - label: "Bump version patch" + # NOTE: a new patch is X.Y.Z, so we check if the version ends with 0 + # to decide if it's a minor or patch release + if: build.env("NEW_VERSION") =~ /0$/ + plugins: + - elastic/vault-github-token#v0.1.0: + - elastic/gh-cli#v0.1.0: + version: "2.62.0" + wait: true + workflow-file: "version_bumps.yml" + workflow-ref: "main" + workflow-inputs: + branch: "${BRANCH}" + bump: "patch" + - block: "Ready to fetch for DRA artifacts?" prompt: | Unblock when your team is ready to proceed. From b05788564406fd09168412e832c1f456c931d885 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 24 Mar 2026 16:49:06 +0100 Subject: [PATCH 2/5] remove validation --- .github/workflows/version_bumps.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/version_bumps.yml b/.github/workflows/version_bumps.yml index c9553af66f..3efcb3c48a 100644 --- a/.github/workflows/version_bumps.yml +++ b/.github/workflows/version_bumps.yml @@ -30,16 +30,6 @@ jobs: INPUTS_BUMP: "${{ inputs.bump }}" BACKPORT_LABEL: "backport-${{ inputs.branch }}" steps: - - name: Fetch logstash-core team member list - uses: tspascoal/get-user-teams-membership@57e9f42acd78f4d0f496b3be4368fc5f62696662 #v3.0.0 - with: - username: ${{ github.actor }} - organization: elastic - team: logstash - GITHUB_TOKEN: ${{ secrets.READ_ORG_SECRET_JSVD }} - - name: Is user a core team member? - if: ${{ steps.checkUserMember.outputs.isTeamMember == 'false' }} - run: exit 1 - name: checkout repo content uses: actions/checkout@v6 with: From ddc855f0eab39762c31f2144f097f17250d8bb6f Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 25 Mar 2026 10:11:20 +0100 Subject: [PATCH 3/5] fix(bk): use the right condition for minor and patches --- .buildkite/version_bump_pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/version_bump_pipeline.yml b/.buildkite/version_bump_pipeline.yml index fd7b40d1d9..ce79bc5710 100644 --- a/.buildkite/version_bump_pipeline.yml +++ b/.buildkite/version_bump_pipeline.yml @@ -21,7 +21,7 @@ steps: - label: "Bump version minor" # NOTE: a new minor is X.Y.0, so we check if the version ends with 0 # to decide if it's a minor or patch release - if: build.env("NEW_VERSION") !~ /0$/ + if: build.env("NEW_VERSION") =~ /0$/ plugins: - elastic/vault-github-token#v0.1.0: - elastic/gh-cli#v0.1.0: @@ -36,7 +36,7 @@ steps: - label: "Bump version patch" # NOTE: a new patch is X.Y.Z, so we check if the version ends with 0 # to decide if it's a minor or patch release - if: build.env("NEW_VERSION") =~ /0$/ + if: build.env("NEW_VERSION") !~ /0$/ plugins: - elastic/vault-github-token#v0.1.0: - elastic/gh-cli#v0.1.0: From 87f56afad0e0d40763cf0979d48fbca8f7e2ba83 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 25 Mar 2026 16:14:45 +0100 Subject: [PATCH 4/5] use WORKFLOW variable --- .buildkite/version_bump_pipeline.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.buildkite/version_bump_pipeline.yml b/.buildkite/version_bump_pipeline.yml index ce79bc5710..d16cb8a8b3 100644 --- a/.buildkite/version_bump_pipeline.yml +++ b/.buildkite/version_bump_pipeline.yml @@ -19,9 +19,7 @@ notify: steps: - label: "Bump version minor" - # NOTE: a new minor is X.Y.0, so we check if the version ends with 0 - # to decide if it's a minor or patch release - if: build.env("NEW_VERSION") =~ /0$/ + if: build.env("WORKFLOW") == "minor" plugins: - elastic/vault-github-token#v0.1.0: - elastic/gh-cli#v0.1.0: @@ -34,9 +32,7 @@ steps: bump: "minor" - label: "Bump version patch" - # NOTE: a new patch is X.Y.Z, so we check if the version ends with 0 - # to decide if it's a minor or patch release - if: build.env("NEW_VERSION") !~ /0$/ + if: build.env("WORKFLOW") == "patch" plugins: - elastic/vault-github-token#v0.1.0: - elastic/gh-cli#v0.1.0: From d0e23b9920d0966fd9dbd603578d3a4d9fcdb3ce Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 25 Mar 2026 16:29:34 +0100 Subject: [PATCH 5/5] fix --- .buildkite/version_bump_pipeline.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.buildkite/version_bump_pipeline.yml b/.buildkite/version_bump_pipeline.yml index d16cb8a8b3..2e57cb224a 100644 --- a/.buildkite/version_bump_pipeline.yml +++ b/.buildkite/version_bump_pipeline.yml @@ -22,8 +22,8 @@ steps: if: build.env("WORKFLOW") == "minor" plugins: - elastic/vault-github-token#v0.1.0: - - elastic/gh-cli#v0.1.0: - version: "2.62.0" + - elastic/gh-cli#v0.1.1: + version: "2.88.1" wait: true workflow-file: "version_bumps.yml" workflow-ref: "main" @@ -35,8 +35,8 @@ steps: if: build.env("WORKFLOW") == "patch" plugins: - elastic/vault-github-token#v0.1.0: - - elastic/gh-cli#v0.1.0: - version: "2.62.0" + - elastic/gh-cli#v0.1.1: + version: "2.88.1" wait: true workflow-file: "version_bumps.yml" workflow-ref: "main"