From 2369e16fc1a2aa7b0c556a4f3b352d4a58e85be3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Oct 2022 12:54:18 +0200 Subject: [PATCH] Backport PR #14645 to 7.17: Avoid to pass SNAPSHOT particle to the version passed to release-manager #14649 The version passed to the release-manager doesn't need the SNAPSHOT particle because already handled by the --workflow="snapshot", if inserted make the release manager to search for artifacts named as 8.5.0-SNAPSHOT-SNAPSHOT (cherry picked from commit b8792107ad4ef25f18cb07ab056a5afc0e4e77c1) Co-authored-by: Andrea Selva --- ci/dra_upload.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/dra_upload.sh b/ci/dra_upload.sh index 32955fb5587..9ad8b3742b2 100755 --- a/ci/dra_upload.sh +++ b/ci/dra_upload.sh @@ -10,6 +10,7 @@ export JRUBY_OPTS="-J-Xmx1g" # e.g.: 8.6.0 # The suffix part like alpha1 etc is managed by the optional VERSION_QUALIFIER_OPT environment variable STACK_VERSION=`cat versions.yml | sed -n 's/^logstash\:[[:space:]]\([[:digit:]]*\.[[:digit:]]*\.[[:digit:]]*\)$/\1/p'` +PLAIN_STACK_VERSION=$STACK_VERSION # This is the branch selector that needs to be passed to the release-manager # It has to be the name of the branch which originates the artifacts. @@ -119,5 +120,5 @@ docker run --rm \ --branch ${RELEASE_BRANCH} \ --commit "$(git rev-parse HEAD)" \ --workflow "${WORKFLOW}" \ - --version "${STACK_VERSION}" \ + --version "${PLAIN_STACK_VERSION}" \ --artifact-set main