Skip to content

Commit

Permalink
account for the 8.x in DRA publishing task
Browse files Browse the repository at this point in the history
the current DRA publishing task computes the branch from the version
contained in the version.yml

This is done by taking the major.minor and confirming that a branch
exists with that name.

However this pattern won't be applicable for 8.x, as that branch
currently points to 8.16.0 and there is no 8.16 branch.

This commit falls back to reading the buildkite injected
BUILDKITE_BRANCH variable.
  • Loading branch information
jsvd committed Sep 9, 2024
1 parent f60e987 commit 18b0943
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .buildkite/scripts/dra/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ RELEASE_VER=`cat versions.yml | sed -n 's/^logstash\:[[:space:]]\([[:digit:]]*\.
if [ -n "$(git ls-remote --heads origin $RELEASE_VER)" ] ; then
RELEASE_BRANCH=$RELEASE_VER
else
RELEASE_BRANCH=main
RELEASE_BRANCH="${BUILDKITE_BRANCH:="main"}"
fi
echo "RELEASE BRANCH: $RELEASE_BRANCH"

if [ -n "$VERSION_QUALIFIER_OPT" ]; then
# Qualifier is passed from CI as optional field and specify the version postfix
Expand Down

0 comments on commit 18b0943

Please sign in to comment.