Skip to content

dra: support bumping releases minor/patch using the existing tools #18886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
v1v wants to merge 5 commits into
base: main
Choose a base branch
from
+26 −11
Open

dra: support bumping releases minor/patch using the existing tools #18886

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d8df424
dra: support bumping releases minor/patch using the existing tools
v1v Mar 24, 2026
b057885
remove validation
v1v Mar 24, 2026
ddc855f
fix(bk): use the right condition for minor and patches
v1v Mar 25, 2026
87f56af
use WORKFLOW variable
v1v Mar 25, 2026
d0e23b9
fix
v1v Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion .buildkite/version_bump_pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Copy link
Copy Markdown
Member Author

@v1v v1v Mar 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ninalee12 , what's the value for BRANCH when running:

  • minor release for main
  • patch releases for 8.19 and 9.x

Copy link
Copy Markdown
Contributor

@ninalee12 ninalee12 Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The values for minor flow would be the major.minor. So if 9.4.0 came out today, the branch would be 9.4. This is what I currently have implemented. Similar conversation here: https://elastic.slack.com/archives/C01DJ3DC0AX/p1773933668868239

As for the patch flow, if 9.3.3 release, the branch would be 9.3. It would be the same for 8.19.x, the branch would be 8.19

I hope this makes sense

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.
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/version_bumps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,6 @@ jobs:
INPUTS_BUMP: "${{ inputs.bump }}"
BACKPORT_LABEL: "backport-${{ inputs.branch }}"
steps:
- name: Fetch logstash-core team member list
Copy link
Copy Markdown
Member Author

@v1v v1v Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need this safeguard, it's gonna be triggered by the automation.

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:
Expand Down
Loading