X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tox.ini;h=2084e5abdfa242e12969230d39f923870a3721a3;hp=0fd86453288c41aba9e91451efed1b629cfbb295;hb=62c4aa14348c9a4e0c44ca01e71ef842760c1d73;hpb=694b418272e9d7670ac69d477ed731bb7445b65a

diff --git a/tox.ini b/tox.ini
index 0fd8645328..2084e5abdf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -25,46 +25,90 @@
 # will execute only checks defined in "pylint" tox environment.
 
 [tox]
-envlist = linelength, autogen, pylint
+# Fast and brief checkers to front, slow or verbose checkers to back.
+envlist = job_spec, copyright_year, gpl_license, model_version,
+    new_line_length, line_length, autogen, pylint, doc_verify
+
 # The following is needed as tox requires setup.py by default.
 skipsdist = true
+# Just a shorthand to avoid long lines.
+checker_dir = ./resources/libraries/bash/entry/check
 
-# TODO: Tox prints various warnings.
-#   Figure out what they are about and fix them.
+# TODO: Tox prints various warnings. Figure them out and fix them.
 
-[testenv:pylint]
-deps =
-    pylint==1.5.4
-    -r ./requirements.txt
-whitelist_externals = /bin/bash
+# Recommended ordering withinn testenv definition:
+# + General comments.
+# + ignore_outcome for non-voting checkers,
+# + setenv (PYTHONPATH) for Python-using checkers.
+# + Other Python stuff (e.g. basepython and deps for pylint).
+# + whitelist_externals to enable bash.
+# + commands with a single bash to launch the corresponding checker script.
+
+# Keep testenvs sorted alphabetically, please.
+
+[testenv:autogen]
 setenv = PYTHONPATH = {toxinidir}
-# Run pylint, but hide its return value until python warnings are cleared.
-commands = bash -c "bash resources/libraries/bash/entry/check/pylint.sh || true"
+whitelist_externals = /bin/bash
+commands = bash {[tox]checker_dir}/autogen.sh
 
-# TODO: See FIXME in https://gerrit.fd.io/r/16423
+[testenv:copyright_year]
+whitelist_externals = /bin/bash
+commands = bash {[tox]checker_dir}/copyright_year.sh
 
-[testenv:linelength]
+[testenv:doc_verify]
+# Fix all documentation error before enabling voting.
+ignore_outcome = true
 whitelist_externals = /bin/bash
-# Fix all transgressions and remove the " || true" workaround.
-commands = bash -c "bash resources/libraries/bash/entry/check/line.sh || true"
+commands = bash {[tox]checker_dir}/doc_verify.sh
 
-# It would be possible to add a check which fails
-# if number of long lines increases (from parent commit value),
-# and have it voting.
-# But that would basically prevent us from adding new suites righ now. :(
+[testenv:gpl_license]
+whitelist_externals = /bin/bash
+commands = bash {[tox]checker_dir}/gpl_license.sh
 
-[testenv:autogen]
+[testenv:job_spec]
+ignore_outcome = true
 whitelist_externals = /bin/bash
+commands = bash {[tox]checker_dir}/job_spec.sh
+
+[testenv:line_length]
+# Fix all transgressions and remove the ignore_outcome flag.
+ignore_outcome = true
+whitelist_externals = /bin/bash
+commands = bash {[tox]checker_dir}/line.sh
+
+[testenv:model_version]
+whitelist_externals = /bin/bash
+commands = bash {[tox]checker_dir}/model_version.sh
+
+[testenv:new_line_length]
+# Adding .svg, big .rst tables, .yaml and similar still requires long lines.
+# As current implementation is too dumb to filter those out,
+# the checker has to remain non-voting.
+ignore_outcome = true
+whitelist_externals = /bin/bash
+commands = bash {[tox]checker_dir}/new_line.sh
+
+[testenv:pylint]
+# Run pylint, but hide its return value until python warnings are cleared.
+ignore_outcome = true
 setenv = PYTHONPATH = {toxinidir}
-commands = bash resources/libraries/bash/entry/check/autogen.sh
+basepython = python3
+deps =
+    pylint==2.4.3
+    -r ./requirements.txt
+whitelist_externals = /bin/bash
+commands = bash {[tox]checker_dir}/pylint.sh
+
+# Keep testenvs sorted alphabetically, please.
 
-# TODO: Migrate current docs check here.
-# TODO: Create license checker.
+# TODO: Add a checker against unresolved merge conflicts.
+#       See: https://gerrit.fd.io/r/c/vpp/+/26956
 # TODO: Create voting "pylint violations should not increase" checker.
-# TODO: Create voting "linelength violations should not increase" checker.
+# TODO: Create voting checker to reject suites with Force Tags of other suite.
+# TODO: Create voting checker against tags not in tag_documentation.rst file.
 # TODO: Create Robot suite Documentation checker (backslash if not next mark).
 # TODO: Create .yaml specific checker, so people can override long line check.
 # TODO: Create .rst specific checker, if there is one allowing
 #       to override line check.
 # TODO: You get the idea, replace line check with something smarter
-#       wherever possible.
\ No newline at end of file
+#       wherever possible.