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
| ... | ... |
@@ -594,8 +594,13 @@ function install_tempest {
|
| 594 | 594 |
# NOTE(mtreinish) Respect constraints in the tempest full venv, things that |
| 595 | 595 |
# are using a tox job other than full will not be respecting constraints but |
| 596 | 596 |
# running pip install -U on tempest requirements |
| 597 |
- $TEMPEST_DIR/.tox/full/bin/pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt |
|
| 598 |
- PROJECT_VENV["tempest"]=${TEMPEST_DIR}/.tox/full
|
|
| 597 |
+ if [[ -d .tox/tempest ]] ; then |
|
| 598 |
+ $TEMPEST_DIR/.tox/tempest/bin/pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt |
|
| 599 |
+ PROJECT_VENV["tempest"]=${TEMPEST_DIR}/.tox/tempest
|
|
| 600 |
+ else |
|
| 601 |
+ $TEMPEST_DIR/.tox/full/bin/pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt |
|
| 602 |
+ PROJECT_VENV["tempest"]=${TEMPEST_DIR}/.tox/full
|
|
| 603 |
+ fi |
|
| 599 | 604 |
popd |
| 600 | 605 |
} |
| 601 | 606 |
|