X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fbranch-cut.sh;h=c22f794c1fcb9ec465fdb870e3e41c8acddc75fb;hb=refs%2Fchanges%2F90%2F110390%2F1;hp=fd0055f6a475823f116a5743bb3d5901bda21b34;hpb=1436f8f5f24783f9d3fae45f4344377f1a32cf68;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/branch-cut.sh b/jjb/autorelease/branch-cut.sh
index fd0055f6a..c22f794c1 100644
--- a/jjb/autorelease/branch-cut.sh
+++ b/jjb/autorelease/branch-cut.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # @License EPL-1.0 <http://spdx.org/licenses/EPL-1.0>
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
@@ -28,13 +28,23 @@ LOG_FILE="$WORKSPACE/archives/branch-cut.log"
 
 set -eu -o pipefail
 
+# shellcheck disable=SC1090
+. ~/lf-env.sh
+
+lf-activate-venv --python python3 "git-review==2.3.1"
+
 # 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
+# Workaround for git-review failing to copy the commit-msg hook to submodules
+git config core.hooksPath "$(git rev-parse --show-toplevel)/.git/hooks"
+
+# 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 +73,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