diff options
| author | Stephen Finucane <stephenfin@redhat.com> | 2019-04-01 14:44:48 +0100 |
|---|---|---|
| committer | Stephen Finucane <stephenfin@redhat.com> | 2019-04-03 15:05:42 +0100 |
| commit | 390f0715633abecd37a4cc97c8a1d1388f6c3bd5 (patch) | |
| tree | cf383223a2efab85747827d954c482d64067085a /tox.ini | |
| parent | 1cbaa2969bb224b5396d36d9c2b91dae85b47dc3 (diff) | |
| download | zuul-390f0715633abecd37a4cc97c8a1d1388f6c3bd5.tar.gz | |
tox: Integrate tox-docker
This allows us to start a zookeeper instance via docker as part of the
standard tox process, avoiding issues like those described in [1]. It's
exposed as a separate target, to ensure users can use local
installations if necessary. This requires bumping the minimum version of
tox to 3.2 so we can make use of the 'requires' config option [2].
[1] https://review.openstack.org/#/c/648399/
[2] https://tox.readthedocs.io/en/latest/config.html#conf-requires
Change-Id: Ie848d409533b2a53523cd930299acf21ac10e13c
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
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 = stestr run {posargs} stestr slowest |