diff options
| author | Zuul <zuul@review.opendev.org> | 2019-05-17 05:42:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-05-17 05:42:08 +0000 |
| commit | a0c299341137890b65be4d7f20ba72f45f699ac2 (patch) | |
| tree | ed064c9b75130c6c4e14c893eebbc8513e8356ea /tox.ini | |
| parent | d23b32c592b94d9c965853e9b0801adea00e766e (diff) | |
| parent | 390f0715633abecd37a4cc97c8a1d1388f6c3bd5 (diff) | |
| download | zuul-a0c299341137890b65be4d7f20ba72f45f699ac2.tar.gz | |
Merge "tox: Integrate tox-docker"
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -1,8 +1,11 @@ [tox] -minversion = 3.1 +minversion = 3.2 skipsdist = True -envlist = pep8,py35 +envlist = pep8,py35{-docker} ignore_basepython_conflict = True +# TODO(stephenfin): It would be good to set 'requires = tox-docker', but doing +# so borks the tools/pip.sh wrapper we're using here and probably isn't what +# we want in the gate :( [testenv] basepython = python3 @@ -28,6 +31,8 @@ whitelist_externals = bash deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt +docker = + docker: zookeeper:3.4 commands = bash -c 'stestr run --concurrency=`python -c "import multiprocessing; print(int(multiprocessing.cpu_count()/2))"` {posargs}' stestr slowest |