X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=tox.ini;h=e5ae4d9312bf6ef2f122182f6c000554f10be8f1;hb=365d0c0fe65;hp=fca2afe8b744ea5b5b741e550679c7b1a7718ba7;hpb=1024ff22b0f0009077227a3b5bfff119beeb4bd1;p=releng%2Fglobal-jjb.git

diff --git a/tox.ini b/tox.ini
index fca2afe8..e5ae4d93 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,8 @@ envlist =
   jjb-latest,
   jjb-version,
   license,
-  pre-commit
+  bashate,
+#  pre-commit
 skipsdist = True
 
 [testenv:docs]
@@ -23,7 +24,7 @@ commands =
 [testenv:jjb]
 basepython = python3
 deps =
-    jenkins-job-builder==2.8.0
+    jenkins-job-builder==4.1.0
 commands =
     jenkins-jobs -l DEBUG test --recursive -o {toxinidir}/archives/job-configs {toxinidir}/jjb:{toxinidir}/.jjb-test
 
@@ -80,10 +81,16 @@ commands =
 basepython = python3
 deps =
     bashate
-whitelist_externals = sh
-                      find
+whitelist_externals = find
+                      sh
+setenv =
+    RULES_IGNORED = E001,E002,E003,E004,E005,E007,E008,E009,E010,E011,E012,E013,E014,E015,E016,E017,E018,E019,E020,E021,E022,E023,E024,E025,E026,E027,E028,E029,E030,E031,E032,E033,E034,E035,E036,E037,E038,E039,E040,E041,E042,E043,E044
+#RULES_IGNORED = `seq -s',E' -w 0 100| cut -d, -f2-6,8-45)`
 commands =
-    find . -not -path '*/\.*' -name *.sh -exec bashate  \{\} +
+    # forbid lines > 120 char
+    sh -c "find . -not -path '*/\.*' -name '*.sh' -exec bashate -e E006 -i $RULES_IGNORED --max-line-length 120 \{\} +"
+    # perform bashate and warn lines > 80 char
+    #find . -not -path '*/\.*' -name *.sh -exec bashate  \{\} +
     #The option --max-line-length 80 is used by default.
 
 #########
@@ -92,7 +99,7 @@ commands =
 
 [testenv:jenkins-jobs]
 deps =
-    jenkins-job-builder{env:JJB_VERSION_OP:~=}{env:JJB_VERSION:2.8.0}
+    jenkins-job-builder{env:JJB_VERSION_OP:~=}{env:JJB_VERSION:4.1.0}
 commands =
     jenkins-jobs {posargs:--help}