Update cloud image CentOS7 robot x86_64

[releng/builder.git] / jjb / autorelease / generate-release-notes.sh

diff --git a/jjb/autorelease/generate-release-notes.sh b/jjb/autorelease/generate-release-notes.sh
index 08c1409caddaa384b6008e39a4c71cede9de61c3..9aa5907328917b76a0b40f6bd15a3a6d94238fe6 100644 (file)
--- a/jjb/autorelease/generate-release-notes.sh
+++ b/jjb/autorelease/generate-release-notes.sh
@@ -14,9 +14,9 @@
 set -x
 
 # shellcheck disable=SC1090
-source ~/lf-env.sh
+. ~/lf-env.sh
 
-lf-activate-venv "git-review==1.28"
+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
@@ -37,7 +37,6 @@ DOCS_DIR=$(mktemp -d)
 git clone -b "$GERRIT_BRANCH" https://git.opendaylight.org/gerrit/docs.git "$DOCS_DIR"
 cd "$DOCS_DIR" || exit 1
 cp "$WORKSPACE/release-notes.rst" "docs/release-notes/release-notes-${RELEASE,,}.rst"
-sed -i -e '$a  .. release-notes-${RELEASE,,}' "docs/release-notes/index.rst"
 git add docs/release-notes/
 
 GERRIT_COMMIT_MESSAGE="Update release notes for $RELEASE"
@@ -58,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