Handle common and seperate tempest tox venvs
In order to support the effort to unify the tox venvs being created by tempest this commit temporarily cases the path of the venv being created. Once tempest is updated to only use .tox/tempest we can remove the if blocks and just use it unconditionally. Change-Id: I34a69020eee07156e64026781a3c0bffdb5ab415
This commit is contained in:
parent
a5c1a93096
commit
b31640af5e
@ -594,8 +594,13 @@ function install_tempest {
|
||||
# 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
|
||||
if [[ -d .tox/tempest ]] ; then
|
||||
$TEMPEST_DIR/.tox/tempest/bin/pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt
|
||||
PROJECT_VENV["tempest"]=${TEMPEST_DIR}/.tox/tempest
|
||||
else
|
||||
$TEMPEST_DIR/.tox/full/bin/pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt
|
||||
PROJECT_VENV["tempest"]=${TEMPEST_DIR}/.tox/full
|
||||
fi
|
||||
popd
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user