@@ -71,6 +71,10 @@ INSTALL_TEMPEST=${INSTALL_TEMPEST:-"True"}

 BOTO_MATERIALS_PATH="$FILES/images/s3-materials/cirros-${CIRROS_VERSION}"

 BOTO_CONF=/etc/boto.cfg

+# This variable is passed directly to pip install inside the common tox venv

+# that is created

+TEMPEST_PLUGINS=${TEMPEST_PLUGINS:-0}

+

 # Cinder/Volume variables

 TEMPEST_VOLUME_DRIVER=${TEMPEST_VOLUME_DRIVER:-default}

 TEMPEST_DEFAULT_VOLUME_VENDOR="Open Source"

@@ -374,7 +378,7 @@ function configure_tempest {

     # NOTE(mtreinish): This must be done after auth settings are added to the tempest config

     local tmp_cfg_file=$(mktemp)

     cd $TEMPEST_DIR

-    tox -revenv -- verify-tempest-config -u -r -o $tmp_cfg_file

+    tox -revenv-tempest -- verify-tempest-config -u -r -o $tmp_cfg_file

     local compute_api_extensions=${COMPUTE_API_EXTENSIONS:-"all"}

     if [[ ! -z "$DISABLE_COMPUTE_API_EXTENSIONS" ]]; then

@@ -620,15 +624,9 @@ 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

-    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

+    PROJECT_VENV["tempest"]=${TEMPEST_DIR}/.tox/tempest

+    if [[ $TEMPEST_PLUGINS != 0 ]] ; then

+        tox -evenv-tempest -- pip install $TEMPEST_PLUGINS

     fi

     install_tempest_lib

     popd