Merge "Set ext net and name server in Shaker templates"

[functest.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index 99bf1c8..6ebd4df 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = docs,pep8,pylint,yamllint,bashate,py27,perm,cover
+envlist = docs,pep8,pylint,yamllint,ansiblelint,bashate,py27,perm,cover
 
 [testenv]
 usedevelop = True
@@ -15,7 +15,6 @@ commands = nosetests --with-xunit \
   --cover-package=functest \
   --cover-xml \
   --cover-html \
-  --with-html-output \
   functest/tests/unit
 
 [testenv:docs]
@@ -40,20 +39,16 @@ commands = flake8
 basepython = python2.7
 whitelist_externals = bash
 modules =
-  functest.ci
   functest.opnfv_tests.openstack.cinder
   functest.opnfv_tests.openstack.rally
   functest.opnfv_tests.openstack.refstack
-  functest.opnfv_tests.openstack.snaps
   functest.opnfv_tests.openstack.tempest
   functest.opnfv_tests.openstack.vmtp
   functest.opnfv_tests.openstack.vping
   functest.opnfv_tests.sdn.odl
   functest.opnfv_tests.vnf.router
-  functest.tests.unit.ci
   functest.tests.unit.odl
   functest.tests.unit.openstack.rally
-  functest.tests.unit.openstack.snaps
   functest.tests.unit.openstack.tempest
   functest.tests.unit.openstack.vmtp
   functest.tests.unit.openstack.vping
@@ -77,15 +72,21 @@ commands =
 basepython = python2.7
 files =
   .travis.yml
-  ci
   docker
   functest/ci
+  functest/opnfv_tests/openstack/rally/blacklist.yaml
   functest/opnfv_tests/openstack/rally/rally_jobs.yaml
+  functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml
   functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
   functest/opnfv_tests/vnf
 commands =
   yamllint -s {[testenv:yamllint]files}
 
+[testenv:ansiblelint]
+basepython = python2.7
+commands =
+  ansible-lint ansible/site.yml
+
 [testenv:py36]
 dirs =
   functest/tests/unit/ci
@@ -109,12 +110,10 @@ commands = bashate {[testenv:bashate]files}
 [testenv:cover]
 basepython = python2.7
 dirs =
-  functest/tests/unit/ci
   functest/tests/unit/odl
   functest/tests/unit/openstack/vping
   functest/tests/unit/openstack/cinder
 commands = nosetests --with-coverage --cover-tests \
-  --cover-package functest.ci.check_deployment \
   --cover-package functest.opnfv_tests.sdn.odl \
   --cover-package functest.opnfv_tests.openstack.vping.vping_ssh \
   --cover-package functest.opnfv_tests.openstack.cinder.cinder_test \