diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-15 23:39:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-15 23:39:52 +0000 |
| commit | 8263624d40b7ca18c3b1fb60b83b7aa2d109b21e (patch) | |
| tree | f105cfd8287058b850368c4a0aaf0f9cbc300310 | |
| parent | caeb661d8a0e73b94a6c54e9dc2bf5b2f4100288 (diff) | |
| parent | 56855f2c924c1739b18895b17003387d7b56c2a8 (diff) | |
| download | ceilometer-8263624d40b7ca18c3b1fb60b83b7aa2d109b21e.tar.gz | |
Merge "tox: Remove useless env"
| -rw-r--r-- | tox.ini | 12 |
1 files changed, 4 insertions, 8 deletions
@@ -35,31 +35,27 @@ setenv = OS_TEST_PATH=ceilometer/tests/functional/ commands = pifpaf run elasticsearch {toxinidir}/tools/pretty_tox.sh "{posargs}" [testenv:functional] -setenv = VIRTUAL_ENV={envdir} - OS_TEST_PATH=ceilometer/tests/functional/ +setenv = OS_TEST_PATH=ceilometer/tests/functional/ passenv = CEILOMETER_* commands = bash -x {toxinidir}/run-functional-tests.sh "{posargs}" [testenv:py34-functional] -setenv = VIRTUAL_ENV={envdir} - OS_TEST_PATH=ceilometer/tests/functional/ +setenv = OS_TEST_PATH=ceilometer/tests/functional/ basepython = python3.4 passenv = CEILOMETER_* commands = bash -x {toxinidir}/run-functional-tests.sh "{posargs}" [testenv:py35-functional] -setenv = VIRTUAL_ENV={envdir} - OS_TEST_PATH=ceilometer/tests/functional/ +setenv = OS_TEST_PATH=ceilometer/tests/functional/ basepython = python3.5 passenv = CEILOMETER_* commands = bash -x {toxinidir}/run-functional-tests.sh "{posargs}" [testenv:integration] -setenv = VIRTUAL_ENV={envdir} - OS_TEST_PATH=./ceilometer/tests/integration +setenv = OS_TEST_PATH=./ceilometer/tests/integration OS_TEST_TIMEOUT=2400 GABBI_LIVE_FAIL_IF_NO_TEST=1 passenv = {[testenv]passenv} HEAT_* CEILOMETER_* GNOCCHI_* AODH_* GLANCE_* NOVA_* ADMIN_* |