[hbase] branch master updated: HBASE-25573 release script generated vote template has incorrect staging area (#2952)

[st...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

stack pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/master by this push:
     new 21409bf  HBASE-25573 release script generated vote template has incorrect staging area (#2952)
21409bf is described below

commit 21409bf4d6c76aa0a903e194226fa9d76a5aed1d
Author: Sean Busbey <bu...@apache.org>
AuthorDate: Mon Mar 15 16:19:21 2021 -0500

    HBASE-25573 release script generated vote template has incorrect staging area (#2952)
    
    Signed-off-by: stack <st...@apache.org>
---
 dev-support/create-release/release-build.sh | 10 +++++-----
 dev-support/create-release/vote.tmpl        |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-support/create-release/release-build.sh b/dev-support/create-release/release-build.sh
index e60e8f3..80f386a 100755
--- a/dev-support/create-release/release-build.sh
+++ b/dev-support/create-release/release-build.sh
@@ -214,6 +214,11 @@ fi
 
 git clean -d -f -x
 cd ..
+if [[ "$PROJECT" =~ ^hbase- ]]; then
+  DEST_DIR_NAME="${PROJECT}-${package_version_name}"
+else
+  DEST_DIR_NAME="$package_version_name"
+fi
 
 if [[ "$1" == "publish-dist" ]]; then
   # Source and binary tarballs
@@ -225,11 +230,6 @@ if [[ "$1" == "publish-dist" ]]; then
     make_binary_release "${PROJECT}" "${RELEASE_VERSION}"
   fi
 
-  if [[ "$PROJECT" =~ ^hbase- ]]; then
-    DEST_DIR_NAME="${PROJECT}-${package_version_name}"
-  else
-    DEST_DIR_NAME="$package_version_name"
-  fi
   svn_target="svn-${PROJECT}"
   svn co --depth=empty "$RELEASE_STAGING_LOCATION" "$svn_target"
   rm -rf "${svn_target:?}/${DEST_DIR_NAME}"
diff --git a/dev-support/create-release/vote.tmpl b/dev-support/create-release/vote.tmpl
index 22b4d30..e1b1f00 100644
--- a/dev-support/create-release/vote.tmpl
+++ b/dev-support/create-release/vote.tmpl
@@ -17,7 +17,7 @@ This tag currently points to git reference
 The release files, including signatures, digests, as well as CHANGES.md
 and RELEASENOTES.md included in this RC can be found at:
 
-  https://dist.apache.org/repos/dist/dev/hbase/${RELEASE_TAG}/
+  https://dist.apache.org/repos/dist/dev/hbase/${DEST_DIR_NAME}/
 
 Maven artifacts are available in a staging repository at: