X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tox.ini;h=6ebd4dfd832f5115f400f13470b370fe22058c18;hb=8be6277951925e0eeaecb078de2ec4c0b007a38a;hp=9fb5a416cb57bab2417eccdbdef9e29a322c16f0;hpb=478d4832d135479695f8a13c220d682da85c818f;p=functest.git

diff --git a/tox.ini b/tox.ini
index 9fb5a416c..6ebd4dfd8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,11 @@
 [tox]
-envlist = docs,pep8,pylint,yamllint,py35,py27,perm,cover
+envlist = docs,pep8,pylint,yamllint,ansiblelint,bashate,py27,perm,cover
 
 [testenv]
 usedevelop = True
 deps =
   -c{toxinidir}/upper-constraints.txt
-  -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=master}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
 install_command = pip install {opts} {packages}
@@ -22,27 +22,14 @@ basepython = python2.7
 commands =
   doc8 \
     --ignore-path api/build \
-    --ignore-path docs/release/release-notes/build \
-    --ignore-path docs/testing/developer/devguide/build \
-    --ignore-path docs/testing/developer/internship/security_group/build \
-    --ignore-path docs/testing/developer/internship/testapi_evolution/build \
-    --ignore-path docs/testing/developer/internship/unit_tests/build \
-    --ignore-path docs/testing/developer/internship/vnf_catalog/build \
-    --ignore-path docs/testing/user/configguide/build \
-    --ignore-path docs/testing/user/userguide/build \
+    --ignore-path docs/build \
+    --ignore-path docs/_build \
     api \
-    docs/release/release-notes \
-    docs/testing/user/configguide \
-    docs/testing/user/userguide
+    docs
   sphinx-build -W -b html api/ api/build
-  sphinx-build -W -b html docs/release/release-notes docs/release/release-notes/build/html
-  sphinx-build -W -b html docs/testing/developer/devguide docs/testing/developer/devguide/build/html
-  sphinx-build -W -b html docs/testing/developer/internship/security_group docs/testing/developer/internship/security_group/build/html
-  sphinx-build -W -b html docs/testing/developer/internship/testapi_evolution docs/testing/developer/internship/testapi_evolution/build/html
-  sphinx-build -W -b html docs/testing/developer/internship/unit_tests docs/testing/developer/internship/unit_tests/build/html
-  sphinx-build -W -b html docs/testing/developer/internship/vnf_catalog docs/testing/developer/internship/vnf_catalog/build/html
-  sphinx-build -W -b html docs/testing/user/configguide docs/testing/user/configguide/build/html
-  sphinx-build -W -b html docs/testing/user/userguide docs/testing/user/userguide/build/html
+  sphinx-build -W -n -b html docs docs/build/html
+  sphinx-build -W -n -b linkcheck docs docs/_build/linkcheck
+  sphinx-build -W -n -b html -c docs/lfreleng docs docs/_build/html
 
 [testenv:pep8]
 basepython = python2.7
@@ -52,22 +39,18 @@ commands = flake8
 basepython = python2.7
 whitelist_externals = bash
 modules =
-  functest.api
-  functest.ci
-  functest.cli
+  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.cli
   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
   functest.tests.unit.vnf.router
   functest.tests.unit.utils
@@ -77,8 +60,9 @@ modules =
   functest.utils.functest_utils
 commands =
   bash -c "\
-    pylint -f parseable --ignore-imports=y --disable=locally-disabled functest | \
-    tee pylint.out | sed -ne '/Raw metrics/,//p'"
+    pylint -f parseable \
+        --ignore-imports=y \
+        --disable=locally-disabled functest | tee pylint.out"
   pylint --reports=n --errors-only functest
   pylint --disable=locally-disabled \
     --disable=duplicate-code \
@@ -89,28 +73,50 @@ basepython = python2.7
 files =
   .travis.yml
   docker
-  functest/api
   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:py35]
+[testenv:ansiblelint]
+basepython = python2.7
+commands =
+  ansible-lint ansible/site.yml
+
+[testenv:py36]
 dirs =
   functest/tests/unit/ci
-  functest/tests/unit/cli
   functest/tests/unit/odl
+  functest/tests/unit/openstack
+  functest/tests/unit/vnf/epc
   functest/tests/unit/utils
-commands = nosetests {[testenv:py35]dirs}
+commands = nosetests {[testenv:py36]dirs}
+
+[testenv:bashate]
+basepython = python2.7
+files =
+  functest/opnfv_tests/openstack/cinder/write_data.sh
+  functest/opnfv_tests/openstack/cinder/read_data.sh
+  functest/ci/add_proxy.sh
+  functest/ci/convert_images.sh
+  functest/ci/download_images.sh
+  build.sh
+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 \
   --cover-package functest.tests.unit \
   --cover-min-percentage 100 {[testenv:cover]dirs}