openstack/devstack
Code Issues Proposed changes

Merge "Move tempest plugin install to the end"

Browse Source
This commit is contained in:
Jenkins 2016-06-02 23:20:00 +00:00 committed by Gerrit Code Review
commit 65dfb9ef65
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extras.d/80-tempest.sh
View File

@ -13,6 +13,8 @@ if is_service_enabled tempest; then
elif [[ "$1" == "stack" && "$2" == "extra" ]]; then elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
echo_summary "Initializing Tempest" echo_summary "Initializing Tempest"
configure_tempest configure_tempest
echo_summary "Installing Tempest Plugins"
install_tempest_plugins
elif [[ "$1" == "stack" && "$2" == "post-extra" ]]; then elif [[ "$1" == "stack" && "$2" == "post-extra" ]]; then
# local.conf Tempest option overrides # local.conf Tempest option overrides
: :

6
lib/tempest
View File

@ -600,6 +600,12 @@ function install_tempest {
# running pip install -U on tempest requirements # running pip install -U on tempest requirements
$TEMPEST_DIR/.tox/tempest/bin/pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt $TEMPEST_DIR/.tox/tempest/bin/pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt
PROJECT_VENV["tempest"]=${TEMPEST_DIR}/.tox/tempest PROJECT_VENV["tempest"]=${TEMPEST_DIR}/.tox/tempest
popd
}
# install_tempest_plugins() - Install any specified plugins into the tempest venv
function install_tempest_plugins {
pushd $TEMPEST_DIR
if [[ $TEMPEST_PLUGINS != 0 ]] ; then if [[ $TEMPEST_PLUGINS != 0 ]] ; then
tox -evenv-tempest -- pip install $TEMPEST_PLUGINS tox -evenv-tempest -- pip install $TEMPEST_PLUGINS
echo "Checking installed Tempest plugins:" echo "Checking installed Tempest plugins:"