Merge "Fixup pbr in LIBS_FROM_GIT"
This commit is contained in:
commit
c7415ba7f9
12
lib/infra
12
lib/infra
@ -30,6 +30,12 @@ REQUIREMENTS_DIR=$DEST/requirements
|
|||||||
# install_infra() - Collect source and prepare
|
# install_infra() - Collect source and prepare
|
||||||
function install_infra {
|
function install_infra {
|
||||||
local PIP_VIRTUAL_ENV="$REQUIREMENTS_DIR/.venv"
|
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
|
# Install pbr
|
||||||
if use_library_from_git "pbr"; then
|
if use_library_from_git "pbr"; then
|
||||||
@ -40,12 +46,6 @@ function install_infra {
|
|||||||
# in via system packages.
|
# in via system packages.
|
||||||
pip_install "-U" "pbr"
|
pip_install "-U" "pbr"
|
||||||
fi
|
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
|
# Restore xtrace
|
||||||
|
Loading…
x
Reference in New Issue
Block a user