openstack/devstack
Code Issues Proposed changes

Merge "Use common tempest tox venv and add plugin install variable"

Browse Source
This commit is contained in:
Jenkins 2016-05-10 01:47:13 +00:00 committed by Gerrit Code Review
commit 2e9c633683
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/tempest
View File

@ -64,6 +64,10 @@ BUILD_TIMEOUT=${BUILD_TIMEOUT:-196}
# have tempest installed in DevStack by default. # have tempest installed in DevStack by default.
INSTALL_TEMPEST=${INSTALL_TEMPEST:-"True"} INSTALL_TEMPEST=${INSTALL_TEMPEST:-"True"}
# This variable is passed directly to pip install inside the common tox venv
# that is created
TEMPEST_PLUGINS=${TEMPEST_PLUGINS:-0}
# Cinder/Volume variables # Cinder/Volume variables
TEMPEST_VOLUME_DRIVER=${TEMPEST_VOLUME_DRIVER:-default} TEMPEST_VOLUME_DRIVER=${TEMPEST_VOLUME_DRIVER:-default}
TEMPEST_DEFAULT_VOLUME_VENDOR="Open Source" TEMPEST_DEFAULT_VOLUME_VENDOR="Open Source"
@ -517,17 +521,17 @@ function configure_tempest {
tmp_cfg_file=$(mktemp) tmp_cfg_file=$(mktemp)
cd $TEMPEST_DIR cd $TEMPEST_DIR
if [[ "$OFFLINE" != "True" ]]; then if [[ "$OFFLINE" != "True" ]]; then
tox -revenv --notest tox -revenv-tempest --notest
fi fi
tox -evenv -- pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt tox -evenv-tempest -- pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt
# Auth: # Auth:
iniset $TEMPEST_CONFIG auth tempest_roles "Member" iniset $TEMPEST_CONFIG auth tempest_roles "Member"
if [[ $TEMPEST_USE_TEST_ACCOUNTS == "True" ]]; then if [[ $TEMPEST_USE_TEST_ACCOUNTS == "True" ]]; then
if [[ $TEMPEST_HAS_ADMIN == "True" ]]; then if [[ $TEMPEST_HAS_ADMIN == "True" ]]; then
tox -evenv -- tempest-account-generator -c $TEMPEST_CONFIG --os-username $admin_username --os-password "$password" --os-tenant-name $admin_project_name -r $TEMPEST_CONCURRENCY --with-admin etc/accounts.yaml tox -evenv-tempest -- tempest-account-generator -c $TEMPEST_CONFIG --os-username $admin_username --os-password "$password" --os-tenant-name $admin_project_name -r $TEMPEST_CONCURRENCY --with-admin etc/accounts.yaml
else else
tox -evenv -- tempest-account-generator -c $TEMPEST_CONFIG --os-username $admin_username --os-password "$password" --os-tenant-name $admin_project_name -r $TEMPEST_CONCURRENCY etc/accounts.yaml tox -evenv-tempest -- tempest-account-generator -c $TEMPEST_CONFIG --os-username $admin_username --os-password "$password" --os-tenant-name $admin_project_name -r $TEMPEST_CONCURRENCY etc/accounts.yaml
fi fi
iniset $TEMPEST_CONFIG auth use_dynamic_credentials False iniset $TEMPEST_CONFIG auth use_dynamic_credentials False
iniset $TEMPEST_CONFIG auth test_accounts_file "etc/accounts.yaml" iniset $TEMPEST_CONFIG auth test_accounts_file "etc/accounts.yaml"
@ -592,12 +596,10 @@ function install_tempest {
# NOTE(mtreinish) Respect constraints in the tempest full venv, things that # 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 # are using a tox job other than full will not be respecting constraints but
# running pip install -U on tempest requirements # 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
$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 if [[ $TEMPEST_PLUGINS != 0 ]] ; then
else tox -evenv-tempest -- pip install $TEMPEST_PLUGINS
$TEMPEST_DIR/.tox/full/bin/pip install -c $REQUIREMENTS_DIR/upper-constraints.txt -r requirements.txt
PROJECT_VENV["tempest"]=${TEMPEST_DIR}/.tox/full
fi fi
popd popd
} }