[hbase] branch HBASE-23337 updated: HBASE-23337 clean up tmp_repo, make sure staged repo gets into email.

[bu...@apache.org]

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

busbey pushed a commit to branch HBASE-23337
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/HBASE-23337 by this push:
     new 134a41e  HBASE-23337 clean up tmp_repo, make sure staged repo gets into email.
134a41e is described below

commit 134a41e6b79492cd72cc40a3b182d44d5d550bcb
Author: Sean Busbey <bu...@apache.org>
AuthorDate: Fri Nov 29 23:02:18 2019 -0600

    HBASE-23337 clean up tmp_repo, make sure staged repo gets into email.
---
 dev-support/create-release/release-build.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/dev-support/create-release/release-build.sh b/dev-support/create-release/release-build.sh
index 8c680c2..3fd63c6 100755
--- a/dev-support/create-release/release-build.sh
+++ b/dev-support/create-release/release-build.sh
@@ -55,7 +55,13 @@ EOF
 set -e
 
 function cleanup {
-  rm ${tmp_settings} &> /dev/null || true
+  echo "Cleaning up temp settings file." >&2
+  rm "${tmp_settings}" &> /dev/null || true
+  # If REPO was set, then leave things be. Otherwise if we defined a repo clean it out.
+  if [[ -z "${REPO}" ]] && [[ -n "${tmp_repo}" ]]; then
+    echo "Cleaning up temp repo. set REPO to reuse downloads." >&2
+    rm -rf "${tmp_repo}" &> /dev/null || true
+  fi
 }
 
 if [ $# -eq 0 ]; then
@@ -141,7 +147,6 @@ git clean -d -f -x
 cd ..
 
 tmp_repo="${REPO:-`pwd`/$(mktemp -d hbase-repo-XXXXX)}"
-# Reexamine. Not sure this working. Pass as arg? That don't seem to work either!
 tmp_settings="/${tmp_repo}/tmp-settings.xml"
 echo "<settings><servers>" > "$tmp_settings"
 echo "<server><id>apache.snapshots.https</id><username>$ASF_USERNAME</username>" >> "$tmp_settings"
@@ -219,6 +224,7 @@ if [[ "$1" == "publish-release" ]]; then
   # Coerce the requested version
   $MVN versions:set -DnewVersion=$VERSION
   declare -a mvn_goals=(clean install)
+  declare staged_repo_id="dryrun-no-repo"
   if ! is_dry_run; then
     mvn_goals=("${mvn_goals[@]}" deploy)
   fi
@@ -234,12 +240,12 @@ if [[ "$1" == "publish-release" ]]; then
   else
     echo "Artifacts successfully built. not staged due to dry run."
   fi
-  )
   # Dump out email to send. Where we find vote.tmpl depends
   # on where this script is run from
   export PROJECT_TEXT=$(echo "${PROJECT}" | sed "s/-/ /g")
-  eval "echo \"$(< ${SELF}/vote.tmpl)\"" |tee vote.txt
+  eval "echo \"$(< ${SELF}/vote.tmpl)\"" |tee "${BASE_DIR}/vote.txt"
   exit 0
+  )
 fi
 
 cd ..