diff --git a/run_tests.sh b/run_tests.sh index 0a49aa3e..5b6ca346 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -45,7 +45,7 @@ fi # run through each tox env and execute the test for tox_env in $(awk -F= '/envlist/ {print $2}' tox.ini | sed 's/,/ /g'); do - if [ "${tox_env}" != "ansible-functional" ]; then + if [[ "${tox_env}" != "ansible-functional" ]] && [[ ${tox_env} != "func_*" ]]; then tox -e ${tox_env} elif [ "${tox_env}" == "ansible-functional" ]; then if ${FUNCTIONAL_TEST}; then diff --git a/tox.ini b/tox.ini index 5cb7b46e..affd9e27 100644 --- a/tox.ini +++ b/tox.ini @@ -162,6 +162,23 @@ commands = {toxinidir}/tests/test.yml -vvvv +# NOTE(andymccr): this will test keystone with uwsgi & nginx +[testenv:func_uwsgi-nginx] +install_command = + pip install -U --force-reinstall {opts} {packages} +deps = + {[testenv:ansible]deps} +setenv = + {[testenv:ansible]setenv} +commands = + {[testenv:ansible]commands} + ansible-playbook -i {toxinidir}/tests/inventory \ + -e "rolename={toxinidir}" \ + -e "install_test_packages=True" \ + -e "keystone_apache_mod_wsgi_enabled=False" \ + {toxinidir}/tests/test.yml -vvvv + + [testenv:linters] deps = {[testenv:ansible]deps}