HBASE-23118 [RELEASE SCRIPTS] Allow creating a RC from an existing ta…

…g[RELEASE SCRIPTS] Allow creating a RC from an existing tag (#686) Signed-off-by: stack <[email protected]>
apache · Oct 4, 2019 · f08a310 · f08a310
1 parent 5aa8d3a
commit f08a310
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/dev-support/create-release/do-release.sh b/dev-support/create-release/do-release.sh
@@ -57,7 +57,13 @@ export GPG_TTY=$(tty)
 
 function should_build {
   local WHAT=$1
-  [ -z "$RELEASE_STEP" ] || [ "$WHAT" = "$RELEASE_STEP" ]
+  if [[ -z "$RELEASE_STEP" ]]; then
+    return 0
+  elif [[ "$RELEASE_STEP" == *"$WHAT"* ]]; then
+    return 0
+  else
+    return 1
+  fi
 }
 
 if should_build "tag" && [ $SKIP_TAG = 0 ]; then

diff --git a/dev-support/create-release/release-util.sh b/dev-support/create-release/release-util.sh
@@ -126,13 +126,15 @@ function get_release_info {
     parse_version)
   echo "Current branch VERSION is $VERSION."
 
-  if [[ ! $VERSION =~ .*-SNAPSHOT ]]; then
-    error "Not a SNAPSHOT version: $VERSION"
-  fi
-
   NEXT_VERSION="$VERSION"
-  RELEASE_VERSION="${VERSION/-SNAPSHOT/}"
+  RELEASE_VERSION=""
   SHORT_VERSION=$(echo "$VERSION" | cut -d . -f 1-2)
+   if [[ ! $VERSION =~ .*-SNAPSHOT ]]; then
+    RELEASE_VERSION="$VERSION"
+  else
+    RELEASE_VERSION="${VERSION/-SNAPSHOT/}"
+  fi
+
   local REV=$(echo "$VERSION" | cut -d . -f 3)
 
   # Find out what RC is being prepared.