diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-07-29 04:03:45 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-07-29 04:03:45 +0000 |
commit | 6b3633c29c7babee7668691cfe0df7b1f7c109a9 (patch) | |
tree | b3ff3fb30d9c03f4f5331b8425412bab309fa9c2 | |
parent | 8bab4a337f9f9deaf2f6610927d950da5b24c5a7 (diff) | |
parent | a9ec13d9493586049791236e3aed70865dbe6e9b (diff) | |
download | oslo-db-6b3633c29c7babee7668691cfe0df7b1f7c109a9.tar.gz |
Merge "Consolidate pifpaf commands into variables"
-rw-r--r-- | tox.ini | 46 |
1 files changed, 11 insertions, 35 deletions
@@ -7,9 +7,18 @@ whitelist_externals = bash env setenv = VIRTUAL_ENV={envdir} + BASECOMMAND=bash tools/pretty_tox.sh + + {postgresql,all}: PIFPAF_POSTGRESQL=pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run postgresql -- + {mysql,all}: PIFPAF_MYSQL=pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql -- + {mysql,postgresql,all}: BASECOMMAND={toxinidir}/tools/run-pifpaf-tests.sh + deps = .[test,fixtures,mysql,postgresql] - py{27,34,35}-{postgresql,mysql,all}: .[pifpaf] -commands = bash tools/pretty_tox.sh '{posargs}' + {postgresql,mysql,all}: .[pifpaf] + +commands = + {env:PIFPAF_MYSQL:} {env:PIFPAF_POSTGRESQL:} {env:BASECOMMAND:} '{posargs}' + passenv = OS_TEST_DBAPI_ADMIN_CONNECTION [testenv:sqla_09] @@ -21,39 +30,6 @@ commands = env TEST_EVENTLET=0 bash tools/pretty_tox.sh '{posargs}' env TEST_EVENTLET=1 bash tools/pretty_tox.sh '{posargs}' -[testenv:py27-all] -commands = pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql -- pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run postgresql -- {toxinidir}/tools/run-pifpaf-tests.sh {posargs} - -[testenv:py34-all] -commands = pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql -- pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run postgresql -- {toxinidir}/tools/run-pifpaf-tests.sh {posargs} - -[testenv:py35-all] -commands = pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql -- pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run postgresql -- {toxinidir}/tools/run-pifpaf-tests.sh {posargs} - -[testenv:py27-mysql] -commands = - pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql {toxinidir}/tools/run-pifpaf-tests.sh {posargs} - -[testenv:py27-postgresql] -commands = - pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run postgresql {toxinidir}/tools/run-pifpaf-tests.sh {posargs} - -[testenv:py34-mysql] -commands = - pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql {toxinidir}/tools/run-pifpaf-tests.sh {posargs} - -[testenv:py35-mysql] -commands = - pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql {toxinidir}/tools/run-pifpaf-tests.sh {posargs} - -[testenv:py34-postgresql] -commands = - pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run postgresql {toxinidir}/tools/run-pifpaf-tests.sh {posargs} - -[testenv:py35-postgresql] -commands = - pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run postgresql {toxinidir}/tools/run-pifpaf-tests.sh {posargs} - [testenv:mysql-python] deps = .[mysql-c,postgresql,test,fixtures] setenv = |