Fixup pbr in LIBS_FROM_GIT
Change-Id: I32594f30a13c0757cc918c8a5e54ae182e985693
diff --git a/lib/infra b/lib/infra
index 4cc2596..585e9b4 100644
--- a/lib/infra
+++ b/lib/infra
@@ -30,6 +30,12 @@
# install_infra() - Collect source and prepare
function install_infra {
local PIP_VIRTUAL_ENV="$REQUIREMENTS_DIR/.venv"
+ # bring down global requirements
+ git_clone $REQUIREMENTS_REPO $REQUIREMENTS_DIR $REQUIREMENTS_BRANCH
+ [ ! -d $PIP_VIRTUAL_ENV ] && virtualenv $PIP_VIRTUAL_ENV
+ # We don't care about testing git pbr in the requirements venv.
+ PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install -U pbr
+ PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install $REQUIREMENTS_DIR
# Install pbr
if use_library_from_git "pbr"; then
@@ -40,12 +46,6 @@
# in via system packages.
pip_install "-U" "pbr"
fi
-
- # bring down global requirements
- git_clone $REQUIREMENTS_REPO $REQUIREMENTS_DIR $REQUIREMENTS_BRANCH
- [ ! -d $PIP_VIRTUAL_ENV ] && virtualenv $PIP_VIRTUAL_ENV
- PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install -U pbr
- PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install $REQUIREMENTS_DIR
}
# Restore xtrace