Skip to content

Commit 17dba9f

Browse files
authored
account for the 8.x in DRA publishing task (#16436)
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.
1 parent f60e987 commit 17dba9f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

.buildkite/scripts/dra/publish.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ RELEASE_VER=`cat versions.yml | sed -n 's/^logstash\:[[:space:]]\([[:digit:]]*\.
1515
if [ -n "$(git ls-remote --heads origin $RELEASE_VER)" ] ; then
1616
RELEASE_BRANCH=$RELEASE_VER
1717
else
18-
RELEASE_BRANCH=main
18+
RELEASE_BRANCH="${BUILDKITE_BRANCH:="main"}"
1919
fi
20+
echo "RELEASE BRANCH: $RELEASE_BRANCH"
2021

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

0 commit comments

Comments
 (0)