Decode Base64 before parsing Gerrit comment

[releng/builder.git] / jjb / autorelease / branch-cut.sh

diff --git a/jjb/autorelease/branch-cut.sh b/jjb/autorelease/branch-cut.sh
index 6d74e78cf3b683e29244b9769e9cecae9d5fa7b7..342786b8b6a78b24882412a6fbf2952015fb8a25 100644 (file)
--- a/jjb/autorelease/branch-cut.sh
+++ b/jjb/autorelease/branch-cut.sh
@@ -28,13 +28,17 @@ LOG_FILE="$WORKSPACE/archives/branch-cut.log"
 
 set -eu -o pipefail
 
+pip install --user --quiet --upgrade git-review
+
 # Validate inputs
 if [ -z "$RELEASE" ]; then
     echo "ERROR: RELEASE variable must be set to a release name. Eg Carbon"
     exit 1
 fi
 
-git config gitreview.username jenkins-releng
+# Setup Gerrit remote to ensure Change-Id gets set on commit.
+git config --global --add gitreview.username "jenkins-$SILO"
+git remote -v
 git submodule foreach git review -s
 git review -s
 
@@ -63,7 +67,7 @@ if [ "$DRY_RUN" = false ]
 then
     echo "Pushing stable/${RELEASE,,} branches to Gerrit"
     git submodule foreach git push gerrit "stable/${RELEASE,,}"
-    git push gerrit "stable/$RELEASE"
+    git push gerrit "stable/${RELEASE,,}"
 fi
 # --- End create new maintenance branch