summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorRory Finnegan <rory.finnegan@gmail.com>2015-04-14 15:07:31 -0400
committerRory Finnegan <rory.finnegan@gmail.com>2015-04-14 16:30:52 -0400
commit131ce117a979f6d592bd9e6c7a70016208040698 (patch)
tree803430e7c208b6ef94776278ebfdcc244d35e6de /tox.ini
parent53177a9bd91a39fbd7019cf0c08939c891aa6167 (diff)
downloadansible-131ce117a979f6d592bd9e6c7a70016208040698.tar.gz
Updated the tox.ini file to run multiple ansible versions.
Purpose: so that devs can use tox to run v1 or v2 of ansible with various versions of python. For example `tox -e py27-v2 will run python2.7 on v2. Currently, only py26 and py27 are run on v1 when running just `tox` so that we aren't breaking builds.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini16
1 files changed, 15 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 7c86e7e08f..5691980b60 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,21 @@
[tox]
-envlist = py26,py27
+envlist = {py26,py27}-v{1}
[testenv]
deps = -r{toxinidir}/test-requirements.txt
whitelist_externals = make
+
+[testenv:py26-v1]
+commands = make tests
+
+[testenv:py27-v1]
commands = make tests
+
+[testenv:py26-v2]
+commands = make newtests
+
+[testenv:py27-v2]
+commands = make newtests
+
+[testenv:py34-v2]
+commands = make newtests