X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgerrit-maven-maven-verify-deps-master-mvn33-openjdk8;fp=.jjb-test%2Fexpected-xml%2Fgerrit-maven-maven-verify-deps-master-mvn33-openjdk8;h=693b4a07c4a10373748de490d674f773c38ffdbf;hb=26f8f7567b04513c34498492b14f19c4741e6921;hp=17ea739ed4359629fc6a2e6c3abcbf98f48e12a9;hpb=c7453d102c1c3f9051864a487d42acc826506830;p=releng%2Fglobal-jjb.git diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8 b/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8 index 17ea739e..693b4a07 100644 --- a/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8 +++ b/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8 @@ -265,6 +265,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/)]}'//") @@ -278,17 +289,6 @@ for patch in $(echo "${PATCHES[@]}"); do projects+=("$project") fi - # 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 - pushd "$REPOS_DIR/$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