Merge "Add functional tests to tox" into stable/kilo

1 files changed, 43 insertions, 4 deletions

diff --git a/tox.ini b/tox.ini
index 282dba038..fbbd700b8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,52 @@
 [tox]
-skipsdist = True
-envlist = pep8
 minversion = 1.6
+skipsdist = True
+envlist = functional
 
 [testenv]
-deps = -r{toxinidir}/test-requirements.txt
+install_command = pip install {opts} {packages}
 
 [testenv:pep8]
-commands = 
+deps = PyYAML
+commands =
     {toxinidir}/tools/validate-all-json.sh
     {toxinidir}/tools/validate-all-yaml.sh
     {toxinidir}/tools/validate-all-maintainer.sh
+
+[testenv:bashate]
+deps = bashate
+whitelist_externals = bash
+# tox improperly interprets # and {1} in regex, so match on [[:punct:]]+
+commands =
+    bash -c "files=`egrep -rlI '^[[:punct:]]+!/(bin/|/usr/bin/env )(ba)?sh' .` && bashate $files"
+
+[testenv:setupenv]
+whitelist_externals = bash
+commands = bash -c tests/setup_docker.sh
+
+[testenv:images]
+deps = -r{toxinidir}/test-requirements.txt
+whitelist_externals = find
+                      bash
+commands =
+   find . -type f -name "*.pyc" -delete
+   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
+   testr run ^(test_images).*
+
+[testenv:startenv]
+whitelist_externals = bash
+commands =
+    bash -c tools/genenv
+    sudo tools/kolla start
+# this can be improved after https://review.openstack.org/#/c/180729/
+# tools/test-deploy
+
+[testenv:functional]
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+whitelist_externals = find
+                      bash
+commands =
+   find . -type f -name "*.pyc" -delete
+   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
+   testr run ^(?!test_images).*