Decode Base64 before parsing Gerrit comment

The Gerrit Trigger plugin defaults to sending us a Base64 encoded
value now so we need to decode it first before we can parse it.

Issue: RELENG-151
Change-Id: Id91c596b117dbf432cff9c52c6990104d628037d
Signed-off-by: Thanh Ha <zxiiro@gmail.com>

diff --git a/jjb/autorelease/generate-release-notes.sh b/jjb/autorelease/generate-release-notes.sh
index f0795e9e5f8f9016ea069baabca04b161def8e53..46efa078f2b52513a4d5a387cb9f8204a9f6ac07 100644 (file)
--- a/jjb/autorelease/generate-release-notes.sh
+++ b/jjb/autorelease/generate-release-notes.sh
@@ -15,7 +15,7 @@ set -x
 
 pip install --user --quiet --upgrade git-review
 
-RELEASE=${RELEASE:-$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep generate-release-notes | awk '{print $2}')}
+RELEASE=${RELEASE:-$(echo "$GERRIT_EVENT_COMMENT_TEXT" | base64 -d | grep generate-release-notes | awk '{print $2}')}
 if [ -z "$RELEASE" ]; then
     echo "ERROR: The RELEASE variable is not set."
     exit 1

diff --git a/jjb/copy-sandbox-logs.sh b/jjb/copy-sandbox-logs.sh
index 2cc2c82c6d45aaf8e7fce482b860620c5c5219a8..e3885e5897bc102e2728cf2ee00c9b586907356d 100644 (file)
--- a/jjb/copy-sandbox-logs.sh
+++ b/jjb/copy-sandbox-logs.sh
@@ -18,7 +18,7 @@
 # Usage: copy-logs: JOB_NAME/BUILD_NUMBER
 echo "---> copy-sandbox-logs.sh"
 
-build_path="$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep 'copy-logs:' | awk -F: '{print $2}' | tr -d '[:space:]')"
+build_path="$(echo "$GERRIT_EVENT_COMMENT_TEXT" | base64 -d | grep 'copy-logs:' | awk -F: '{print $2}' | tr -d '[:space:]')"
 fetch_url="https://logs.opendaylight.org/sandbox/vex-yul-odl-jenkins-2/$build_path"
 
 COPY_DIR="$WORKSPACE/archives"