Merge "Update cloud image CentOS7 devstack x86_64"

[releng/builder.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index d2b17739bc08e8780546926ddff0b61fb16c3a52..56b21b345ef15fc1e7fe789a7f26950e8c385530 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = docs,docs-linkcheck,jjb-version,prefix,robot,pylint
-#    pre-commit
+envlist = docs,docs-linkcheck,jjb-version,prefix,robot
 skipsdist = true
 
 [testenv:docs]
@@ -9,14 +8,14 @@ deps = -rdocs/requirements.txt
 commands = sphinx-build -q -W -b html -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
 
 [testenv:docs-linkcheck]
-passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
+passenv = http_proxy, https_proxy, no_proxy
 basepython = python3
 deps = -rdocs/requirements.txt
 commands = sphinx-build -q -W -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck
 
 [testenv:jenkins-jobs]
 deps =
-    jenkins-job-builder=={env:JJB_VERSION:4.1.0}
+    jenkins-job-builder=={env:JJB_VERSION:5.0.2}
 commands =
     jenkins-jobs {posargs:--help}
 
@@ -66,7 +65,7 @@ commands =
 
 [testenv:checkbashisms]
 deps =
-whitelist_externals = sh
+allowlist_externals = sh
                       find
                       checkbashisms
 commands =
@@ -78,7 +77,7 @@ commands =
 [testenv:pylint]
 basepython = python3
 deps = pylint>=2.6.0
-whitelist_externals = find
+allowlist_externals = find
 commands =
 # .tox folder and submodules directories global-jjb/ & packer/common-packer/ must be excluded since they are not maintained here
     find . -name *.py -not -path "./.tox/*" -not -path "./global-jjb/*" -not -path "./packer/common-packer/*" -exec \