openstack/devstack
Code Issues Proposed changes

Merge "Ensure we install tempest-lib from git in tempest's tox venv"

Browse Source
This commit is contained in:
Jenkins 2015-02-20 21:04:09 +00:00 committed by Gerrit Code Review
commit d070ad22fd
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/tempest
View File

@ -517,14 +517,23 @@ function install_tempest_lib {
if use_library_from_git "tempest-lib"; then
git_clone_by_name "tempest-lib"
setup_dev_lib "tempest-lib"
# NOTE(mtreinish) For testing tempest-lib from git with tempest we need
# put the git version of tempest-lib in the tempest job's tox venv
export PIP_VIRTUAL_ENV=${PROJECT_VENV["tempest"]}
setup_dev_lib "tempest-lib"
unset PIP_VIRTUAL_ENV
fi
}
# install_tempest() - Collect source and prepare
function install_tempest {
install_tempest_lib
git_clone $TEMPEST_REPO $TEMPEST_DIR $TEMPEST_BRANCH
pip_install tox
pushd $TEMPEST_DIR
tox --notest -efull
PROJECT_VENV["tempest"]=${TEMPEST_DIR}/.tox/full
install_tempest_lib
popd
}
# init_tempest() - Initialize ec2 images