[geode] branch develop updated: GEODE-9447: fix release scripts (#6712)

[on...@apache.org]

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

onichols pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 7e246f5  GEODE-9447: fix release scripts (#6712)
7e246f5 is described below

commit 7e246f55aeea66c1209d1ce11517accc3dc8fa02
Author: Owen Nichols <34...@users.noreply.github.com>
AuthorDate: Mon Jul 26 18:24:46 2021 -0700

    GEODE-9447: fix release scripts (#6712)
    
    * get upthewaterspout from the right repo
    * ensure native build from src tgz uses latest geode AND native bits
    * consider JAVA_HOME during initial environment checks
    * check that docker daemon is running before getting started
---
 dev-tools/release/deploy_rc_pipeline.sh |  5 +++--
 dev-tools/release/prepare_rc.sh         |  9 +++++----
 dev-tools/release/promote_rc.sh         | 12 +++++++++++-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/dev-tools/release/deploy_rc_pipeline.sh b/dev-tools/release/deploy_rc_pipeline.sh
index 5f4e7fe..9ae1905 100755
--- a/dev-tools/release/deploy_rc_pipeline.sh
+++ b/dev-tools/release/deploy_rc_pipeline.sh
@@ -84,7 +84,7 @@ resources:
   type: git
   source:
     branch: master
-    uri: https://github.com/apache/geode.git
+    uri: https://github.com/upthewaterspout/geode-release-check.git
 
 jobs:
   - name: build-geode-from-tag
@@ -320,6 +320,7 @@ jobs:
         - get: geode-native
           trigger: true
         - get: geode
+          trigger: true
       - task: validate
         timeout: 1h
         config:
@@ -391,7 +392,7 @@ jobs:
             - |
               set -ex
               apt update -q
-              apt install -qq -y --no-install-recommends unzip git gpg
+              apt install -qq -y --no-install-recommends unzip git gpg wget
               FULL_VERSION=$(cd geode && git describe --tags | sed -e 's#^rel/v##')
               VERSION=$(echo $FULL_VERSION|sed -e 's/\.RC.*//')
               STAGING_MAVEN=$(cat geode-examples/gradle.properties | grep geodeRepositoryUrl | awk '{print $3}')
diff --git a/dev-tools/release/prepare_rc.sh b/dev-tools/release/prepare_rc.sh
index 1033577..ba8b529 100755
--- a/dev-tools/release/prepare_rc.sh
+++ b/dev-tools/release/prepare_rc.sh
@@ -84,15 +84,16 @@ echo ""
 echo "============================================================"
 echo "Checking java..."
 echo "============================================================"
-if ! java -XshowSettings:properties -version 2>&1 | grep 'java.specification.version = 1.8' ; then
+[ -z "$JAVA_HOME" ] && JAVA=java || JAVA=$JAVA_HOME/bin/java
+if ! $JAVA -XshowSettings:properties -version 2>&1 | grep 'java.specification.version = 1.8' ; then
   echo "Please set JAVA_HOME to use JDK 8 to compile Geode for release"
   exit 1
 fi
-if java -XshowSettings:properties -version 2>&1 | grep 'java.vm.vendor = Oracle' ; then
+if $JAVA -XshowSettings:properties -version 2>&1 | grep 'java.vm.vendor = Oracle' ; then
   echo "Please set JAVA_HOME to use an Open JDK 8 such as from https://adoptopenjdk.net/?variant=openjdk8&jvmVariant=hotspot to compile Geode for release"
   exit 1
 else
-  java -XshowSettings:properties -version 2>&1 | grep 'java.vm.vendor = '
+  $JAVA -XshowSettings:properties -version 2>&1 | grep 'java.vm.vendor = '
 fi
 
 
@@ -281,7 +282,7 @@ set +x
 function failMsg2 {
   errln=$1
   echo "ERROR: script did NOT complete successfully"
-  echo "Comment out any steps that already succeeded (approximately lines 143-$(( errln - 1 ))) and try again"
+  echo "Comment out any steps that already succeeded (approximately lines 144-$(( errln - 1 ))) and try again"
   echo "For this script only (prepare_rc.sh), it's also safe to just try again from the top"
 }
 trap 'failMsg2 $LINENO' ERR
diff --git a/dev-tools/release/promote_rc.sh b/dev-tools/release/promote_rc.sh
index dd8c88c..3d50be3 100755
--- a/dev-tools/release/promote_rc.sh
+++ b/dev-tools/release/promote_rc.sh
@@ -88,10 +88,20 @@ else
 fi
 
 
+echo ""
+echo "============================================================"
+echo "Checking docker..."
+echo "============================================================"
+if ! docker images >/dev/null ; then
+  echo "Make sure docker daemon is running and try again."
+  exit 1
+fi
+
+
 function failMsg {
   errln=$1
   echo "ERROR: script did NOT complete successfully"
-  echo "Comment out any steps that already succeeded (approximately lines 116-$(( errln - 1 ))) and try again"
+  echo "Comment out any steps that already succeeded (approximately lines 126-$(( errln - 1 ))) and try again"
 }
 trap 'failMsg $LINENO' ERR