Merge "Explicitly install pbr via pip"

This commit is contained in:
Jenkins 2014-03-24 23:24:33 +00:00 committed by Gerrit Code Review
commit 3815353d6d
8 changed files with 22 additions and 0 deletions

View File

@ -9,6 +9,9 @@ mkdir -p /opt/stack/venvs
VENV=/opt/stack/venvs/heat-cfntools
virtualenv $VENV
# bug #1293812 : Avoid easy_install triggering on pbr.
$VENV/bin/pip install -U 'pbr>=0.5.21,<1.0'
$VENV/bin/pip install heat-cfntools
# symlink to /opt/aws/bin

View File

@ -20,6 +20,10 @@ set -u
# downloading from pypi using http_proxy and https_proxy
pip install -U 'setuptools>=1.0'
# bug #1293812 : Avoid easy_install triggering on pbr.
pip install -U 'pbr>=0.5.21,<1.0'
pushd /opt/stack/$repo
if [ -e requirements.txt ]; then
pip install -r requirements.txt

View File

@ -8,6 +8,8 @@ virtualenv --setuptools /opt/stack/venvs/os-apply-config
# https://pypi.python.org/simple/ if using http_proxy and https_proxy
# envvars
/opt/stack/venvs/os-apply-config/bin/pip install -U 'setuptools>=1.0'
# bug #1293812 : Avoid easy_install triggering on pbr.
/opt/stack/venvs/os-apply-config/bin/pip install -U 'pbr>=0.6,<1.0'
/opt/stack/venvs/os-apply-config/bin/pip install -U os-apply-config
ln -s /opt/stack/venvs/os-apply-config/bin/os-apply-config /usr/local/bin/os-apply-config

View File

@ -8,6 +8,8 @@ virtualenv --setuptools /opt/stack/venvs/os-collect-config
# Need setuptools>=1.0 to manage connections when
# downloading from pypi using http_proxy and https_proxy
/opt/stack/venvs/os-collect-config/bin/pip install -U 'setuptools>=1.0'
# bug #1293812 : Avoid easy_install triggering on pbr.
/opt/stack/venvs/os-collect-config/bin/pip install -U 'pbr>=0.6,<1.0'
/opt/stack/venvs/os-collect-config/bin/pip install -U os-collect-config
ln -s /opt/stack/venvs/os-collect-config/bin/os-collect-config /usr/local/bin/os-collect-config

View File

@ -12,6 +12,8 @@ virtualenv --setuptools /opt/stack/venvs/os-refresh-config
# downloading from pypi using http_proxy and https_proxy
/opt/stack/venvs/os-refresh-config/bin/pip install -U pip
/opt/stack/venvs/os-refresh-config/bin/pip install -U 'setuptools>=1.0'
# bug #1293812 : Avoid easy_install triggering on pbr.
/opt/stack/venvs/os-refresh-config/bin/pip install -U 'pbr>=0.5.21,<1.0'
/opt/stack/venvs/os-refresh-config/bin/pip install -U os-refresh-config
ln -s /opt/stack/venvs/os-refresh-config/bin/os-refresh-config /usr/local/bin/os-refresh-config

View File

@ -31,6 +31,9 @@ function python_install() {
# https_proxy envvars
pip install -U 'setuptools>=1.0'
# bug #1293812 : Avoid easy_install triggering on pbr.
pip install -U 'pbr>=0.5.21,<1.0'
if [ -n "$reqs" ] ; then
pip install -r $reqs
# FIXME: pip requires doesn't include MySQL-python

View File

@ -2,6 +2,9 @@
set -eux
# bug #1293812 : Avoid easy_install triggering on pbr.
$SWIFT_VENV_DIR/bin/pip install -U 'pbr>=0.5.21,<1.0'
# This is only needed if using keystone auth, so isn't in requirements.txt
$SWIFT_VENV_DIR/bin/pip install python-keystoneclient

View File

@ -8,6 +8,9 @@ os-svc-install -u tempest -r /opt/stack/tempest
source $TEMPEST_VENV_DIR/bin/activate
cd /opt/stack/tempest
# bug #1293812 : Avoid easy_install triggering on pbr.
pip install -U 'pbr>=0.5.21,<1.0'
pip install -r test-requirements.txt
testr init