Merge "Respect constraints in tempest tox venvs"

This commit is contained in:
Jenkins 2016-02-18 21:03:11 +00:00 committed by Gerrit Code Review
commit 5c61de26ba

View File

@ -321,7 +321,10 @@ function configure_tempest {
local tmp_cfg_file
tmp_cfg_file=$(mktemp)
cd $TEMPEST_DIR
tox -revenv -- tempest verify-config -u -r -o $tmp_cfg_file
tox -revenv --notest
# NOTE(mtreinish): Respect constraints on tempest verify-config venv
tox -evenv -- pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt
tox -evenv -- tempest verify-config -uro $tmp_cfg_file
local compute_api_extensions=${COMPUTE_API_EXTENSIONS:-"all"}
if [[ ! -z "$DISABLE_COMPUTE_API_EXTENSIONS" ]]; then
@ -584,6 +587,10 @@ function install_tempest {
pip_install tox
pushd $TEMPEST_DIR
tox --notest -efull
# NOTE(mtreinish) Respect constraints in the tempest full venv, things that
# are using a tox job other than full will not be respecting constraints but
# running pip install -U on tempest requirements
$TEMPEST_DIR/.tox/full/bin/pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt
PROJECT_VENV["tempest"]=${TEMPEST_DIR}/.tox/full
install_tempest_lib
popd