From 3d5e917d762f36b387bd62bafa6af40b8a845601 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Wed, 10 Mar 2021 09:15:04 +1000 Subject: [PATCH] Pin git review to 1.78 The latest version of module trys to look for git hook recursively within the submodules. Error: Entering 'global-jjb' cannot stat '.git/hooks/commit-msg': Not a directory fatal: run_command returned non-zero status for global-jjb Remove workaround that has been resolved in v1.28 and use lf-activate-venv to install git-review Issue: RELENG-3435 Signed-off-by: Anil Belur Change-Id: I6839e2466174b3d27df21853bf960aa7c7711526 Signed-off-by: Anil Belur --- jjb/autorelease/branch-cut.sh | 5 ++++- jjb/autorelease/generate-release-notes.sh | 5 ++++- jjb/autorelease/version-bump.sh | 5 ++++- jjb/docs/docs_version_bump_projects.sh | 12 ++++++------ 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/jjb/autorelease/branch-cut.sh b/jjb/autorelease/branch-cut.sh index 342786b8b..0c24b27c9 100644 --- a/jjb/autorelease/branch-cut.sh +++ b/jjb/autorelease/branch-cut.sh @@ -28,7 +28,10 @@ LOG_FILE="$WORKSPACE/archives/branch-cut.log" set -eu -o pipefail -pip install --user --quiet --upgrade git-review +# shellcheck disable=SC1090 +source ~/lf-env.sh + +lf-activate-venv "git-review==1.28" # Validate inputs if [ -z "$RELEASE" ]; then diff --git a/jjb/autorelease/generate-release-notes.sh b/jjb/autorelease/generate-release-notes.sh index 46efa078f..3e5992ab9 100644 --- a/jjb/autorelease/generate-release-notes.sh +++ b/jjb/autorelease/generate-release-notes.sh @@ -13,7 +13,10 @@ set -x -pip install --user --quiet --upgrade git-review +# shellcheck disable=SC1090 +source ~/lf-env.sh + +lf-activate-venv "git-review==1.28" RELEASE=${RELEASE:-$(echo "$GERRIT_EVENT_COMMENT_TEXT" | base64 -d | grep generate-release-notes | awk '{print $2}')} if [ -z "$RELEASE" ]; then diff --git a/jjb/autorelease/version-bump.sh b/jjb/autorelease/version-bump.sh index 1980f77df..f54e0a3e8 100644 --- a/jjb/autorelease/version-bump.sh +++ b/jjb/autorelease/version-bump.sh @@ -26,7 +26,10 @@ BRANCH="$GERRIT_BRANCH" # Ensure we fail the job if any steps fail. set -eu -o pipefail -pip install --user --quiet --upgrade git-review +# shellcheck disable=SC1090 +source ~/lf-env.sh + +lf-activate-venv "git-review==1.28" # Fail if branch cutting is not on master if [ "$BRANCH_CUT" = "true" ] && [ "$BRANCH" != "master" ]; then diff --git a/jjb/docs/docs_version_bump_projects.sh b/jjb/docs/docs_version_bump_projects.sh index ce7cd3ba3..6db45944a 100644 --- a/jjb/docs/docs_version_bump_projects.sh +++ b/jjb/docs/docs_version_bump_projects.sh @@ -28,12 +28,12 @@ while getopts :h: opts; do ;; esac done -set +u # Allow unbound variables for virtualenv -virtualenv --quiet "/tmp/v/git-review" -# shellcheck source=/tmp/v/git-review/bin/activate disable=SC1091 -source "/tmp/v/git-review/bin/activate" -pip install --quiet --upgrade "pip==9.0.3" setuptools -pip install --quiet --upgrade git-review + +# shellcheck disable=SC1090 +source ~/lf-env.sh + +lf-activate-venv "git-review==1.28" + git config --global --add gitreview.username "jenkins-$SILO" cd "$WORKSPACE"/autorelease || exit GERRIT_PROJECT="releng/autorelease" -- 2.36.6