X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fgenerate-release-notes.sh;h=9aa5907328917b76a0b40f6bd15a3a6d94238fe6;hb=c66102093626187308b241f79772e4165f43fab6;hp=c741d75aafaf4ea72fd7377a9f1433c1dff90aba;hpb=5f34bd64037b07b1ea15e2799945b344704e497a;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/generate-release-notes.sh b/jjb/autorelease/generate-release-notes.sh
index c741d75aa..9aa590732 100644
--- a/jjb/autorelease/generate-release-notes.sh
+++ b/jjb/autorelease/generate-release-notes.sh
@@ -13,9 +13,12 @@
 
 set -x
 
-pip install --user --quiet --upgrade git-review
+# shellcheck disable=SC1090
+. ~/lf-env.sh
 
-RELEASE=${RELEASE:-$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep generate-release-notes | awk '{print $2}')}
+lf-activate-venv --python python3 "git-review==2.3.1"
+
+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
@@ -36,7 +39,7 @@ cd "$DOCS_DIR" || exit 1
 cp "$WORKSPACE/release-notes.rst" "docs/release-notes/release-notes-${RELEASE,,}.rst"
 git add docs/release-notes/
 
-GERRIT_COMMIT_MESSAGE="Update release notes"
+GERRIT_COMMIT_MESSAGE="Update release notes for $RELEASE"
 GERRIT_TOPIC="autogenerate-release-notes"
 CHANGE_ID=$(ssh -p 29418 "jenkins-$SILO@git.opendaylight.org" gerrit query \
                limit:1 owner:self is:open project:docs \
@@ -54,6 +57,9 @@ fi
 git status
 git remote add gerrit "ssh://jenkins-$SILO@git.opendaylight.org:29418/docs.git"
 
+# Workaround for git-review failing to copy the commit-msg hook to submodules
+git config core.hooksPath "$(git rev-parse --show-toplevel)/.git/hooks"
+
 # Don't fail the build if this command fails because it's possible that there
 # is no changes since last update.
-git review --yes -t "$GERRIT_TOPIC" || true
+git review --yes -t "$GERRIT_TOPIC" "$GERRIT_BRANCH" || true