[metron] branch master updated: METRON-2093 Metron RC check script is outdated (justinleet) closes apache/metron#1394

[le...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 4390e38  METRON-2093 Metron RC check script is outdated (justinleet) closes apache/metron#1394
4390e38 is described below

commit 4390e38c2460624734ead7ab6f9fff3738471c4e
Author: justinleet <ju...@gmail.com>
AuthorDate: Thu May 2 11:35:27 2019 -0400

    METRON-2093 Metron RC check script is outdated (justinleet) closes apache/metron#1394
---
 dev-utilities/release-utils/metron-rc-check         | 21 +++++++++++----------
 .../release-utils/prepare-release-candidate         |  3 +--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dev-utilities/release-utils/metron-rc-check b/dev-utilities/release-utils/metron-rc-check
index 143ba85..5b3a5d9 100755
--- a/dev-utilities/release-utils/metron-rc-check
+++ b/dev-utilities/release-utils/metron-rc-check
@@ -30,7 +30,9 @@ function help {
   echo " "
 }
 
-METRON_DIST="https://dist.apache.org/repos/dist/dev/metron/"
+APACHE_REPO="https://dist.apache.org/repos/dist/"
+METRON_DIST=${APACHE_REPO}"dev/metron/"
+METRON_KEYS=${APACHE_REPO}"release/metron/KEYS"
 # print help, if the user just runs this without any args
 if [ "$#" -eq 0 ]; then
     help
@@ -156,14 +158,13 @@ if [ ! -d "$WORK" ]; then
 fi
 echo "Working directory $WORK"
 
-KEYS="$METRON_RC_DIST/KEYS"
-METRON_ASSEMBLY="$METRON_RC_DIST/apache-metron-$METRON_VERSION-$RC.tar.gz"
+METRON_ASSEMBLY="$METRON_RC_DIST/apache-metron_$METRON_VERSION-$RC.tar.gz"
 METRON_ASSEMBLY_SIG="$METRON_ASSEMBLY.asc"
 
 
-echo "Downloading $KEYS"
-if ! wget -P "$WORK" "$KEYS" ; then
-  echo "[ERROR] Failed to download $KEYS"
+echo "Downloading $METRON_KEYS"
+if ! wget -P "$WORK" "$METRON_KEYS" ; then
+  echo "[ERROR] Failed to download $METRON_KEYS"
   exit 1
 fi
 
@@ -206,7 +207,7 @@ if ! gpg --import KEYS ; then
 fi
 
 echo "Verifying Metron Assembly"
-if ! gpg --verify ./"apache-metron-$METRON_VERSION-$RC.tar.gz.asc" "apache-metron-$METRON_VERSION-$RC.tar.gz" ; then
+if ! gpg --verify ./"apache-metron_$METRON_VERSION-$RC.tar.gz.asc" "apache-metron_$METRON_VERSION-$RC.tar.gz" ; then
   echo "[ERROR] failed to verify Metron Assembly"
   exit 1
 fi
@@ -227,7 +228,7 @@ if [ -n "$BRO" ]; then
 fi
 
 echo "Unpacking Assemblies"
-if ! tar -xzf "apache-metron-$METRON_VERSION-$RC.tar.gz" ; then
+if ! tar -xzf "apache-metron_$METRON_VERSION-$RC.tar.gz" ; then
   echo "[ERROR] failed to unpack Metron Assembly"
   exit 1
 fi
@@ -238,7 +239,7 @@ read -p "  run test suite [install, unit tests, integration tests, ui tests, lic
 echo
 DID_BUILD=0
 if [[ $REPLY =~ ^[Yy]$ ]]; then
-  cd "apache-metron-$METRON_VERSION-$RC" || exit 1
+  cd "apache-metron_${METRON_VERSION}-$RC" || exit 1
   if ! mvn -q -T 2C -DskipTests clean install  ; then
     echo "[ERROR] failed to mvn install metron"
     exit 1
@@ -273,7 +274,7 @@ echo ""
 read -p "  run vagrant full_dev? [yN] " -n 1 -r
 echo
 if [[ $REPLY =~ ^[Yy]$ ]]; then
-  cd "$WORK/apache-metron-$METRON_VERSION-$RC/metron-deployment/development/centos6" || exit 1
+  cd "$WORK/apache-metron_${METRON_VERSION}-$RC/metron-deployment/development/centos6" || exit 1
   if [[ ${DID_BUILD} -ne 1 ]]; then
     vagrant up
   else
diff --git a/dev-utilities/release-utils/prepare-release-candidate b/dev-utilities/release-utils/prepare-release-candidate
index cb0585d..e2daa4d 100755
--- a/dev-utilities/release-utils/prepare-release-candidate
+++ b/dev-utilities/release-utils/prepare-release-candidate
@@ -299,7 +299,7 @@ if [[ $? -ne 0 ]]; then
   exit 1
 fi
 
-printf "Extracting LICENSE, NOTICE, and KEYS from tarball\n" # Only pull from core
+printf "Extracting LICENSE and NOTICE from tarball\n" # Only pull from core
 cd ${ART_DIR}
 
 if [ "${CHOSEN_REPO}" = "${BRO_PLUGIN_REPO_NAME}" ]; then
@@ -311,7 +311,6 @@ fi
 
 # TODO figure out what to do for bro repo here. The KEYS file only needs to live in the /dist root, rather than in each sub repo.
 # Should we have a separate process for adding to the KEYS file without doing a Metron release?
-#tar --strip-components=1 -zxvf "${ARTIFACT}.tar.gz" "${ARTIFACT}/KEYS"
 tar --strip-components=1 -zxvf "${ARTIFACT}.tar.gz" "${ARTIFACT}/NOTICE"
 
 # Add the directory and commit to subversion