Add pip.conf to wrappers

[releng/global-jjb.git] / shell / gerrit-fetch-dependencies.sh

diff --git a/shell/gerrit-fetch-dependencies.sh b/shell/gerrit-fetch-dependencies.sh
index e9c337c..99a71f0 100644 (file)
--- a/shell/gerrit-fetch-dependencies.sh
+++ b/shell/gerrit-fetch-dependencies.sh
@@ -24,6 +24,17 @@ REPOS_DIR="$WORKSPACE/.repos"
 
 IFS=" " read -r -a PATCHES <<< "$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep 'recheck:' | awk -F: '{print $2}')"
 
+# Workaround for git-review bug in v1.24
+# https://storyboard.openstack.org/#!/story/2001081
+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
+pip install --quiet --upgrade git-review
+set -u
+# End git-review workaround
+
 projects=()
 for patch in $(echo "${PATCHES[@]}"); do
     json=$(curl -s "$GERRIT_URL/changes/$patch" | sed -e "s/)]}'//")
@@ -38,7 +49,10 @@ for patch in $(echo "${PATCHES[@]}"); do
     fi
 
     pushd "$REPOS_DIR/$project"
-    git remote add gerrit "$GIT_URL/$project"
+    # If remote gerrit already exists just make sure path is expected
+    if ! git remote add gerrit "$GERRIT_URL/$project" > /dev/null 2>&1; then
+        git remote set-url gerrit "$GERRIT_URL/$project"
+    fi
     git review --cherrypick="$patch"
     popd
 done