X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=tox.ini;h=d9ebf87f76eb7f5b588c3ffc9b1301ccb94e6889;hb=8901fe0bee2fecb6b32accffd9f952d46da59a38;hp=50139f22652432c57d7837350377772c3f7f3bfd;hpb=dce223775bacca596e11f2eb2b064b6ca3fd40da;p=releng%2Fglobal-jjb.git

diff --git a/tox.ini b/tox.ini
index 50139f22..d9ebf87f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,30 +8,40 @@ envlist =
   jjb-version,
   license,
   bashate,
-#  pre-commit
+  pre-commit
 skipsdist = True
 
 [testenv:docs]
 basepython = python3
 deps = -rrequirements.txt
+allowlist_externals =
+    git
 commands =
+    # Full repository depth required for docs job to run (release notes)
+    git fetch --unshallow
     sphinx-build -W -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
 
 [testenv:ensure-documented]
+allowlist_externals =
+    ./ensure-documented.sh
 commands =
     ./ensure-documented.sh
 
 [testenv:jjb]
 basepython = python3
 deps =
-    jenkins-job-builder==2.8.0
+    jenkins-job-builder==6.0.0
+    # RELENG-5179 (undeclared dependency by stevedore)
+    setuptools
 commands =
     jenkins-jobs -l DEBUG test --recursive -o {toxinidir}/archives/job-configs {toxinidir}/jjb:{toxinidir}/.jjb-test
 
 [testenv:jjb-compare-xml]
 basepython = python3
 deps =
-    jenkins-job-builder
+    jenkins-job-builder==6.0.0
+allowlist_externals =
+    ./jjb-compare-xml.sh
 commands =
     ./jjb-compare-xml.sh
 
@@ -81,7 +91,7 @@ commands =
 basepython = python3
 deps =
     bashate
-whitelist_externals = find
+allowlist_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
@@ -90,7 +100,7 @@ commands =
     # 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  \{\} +
+    #find . -not -path '*/\.*' -name *.sh -exec bashate  \{\} +
     #The option --max-line-length 80 is used by default.
 
 #########
@@ -99,7 +109,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:6.0.0}
 commands =
     jenkins-jobs {posargs:--help}