Merge "Pin tox to be less than 4"

.zuul.yaml

@@ -1,5 +1,7 @@
 ---
 - project:
+    vars:
+      ensure_tox_version: '<4'
     templates:
       - stx-api-ref-jobs
     check:

tox.ini

@@ -29,24 +29,24 @@ commands =
   git restore doc/source/dist_cloud/kubernetes/*
   bash hw-updates.sh
   bash htmlChecks.sh doc/build/html
-allowlist_externals = bash
+
+# Note: The dev env for the docs team uses a version of tox that does not yet support allowlist_externals
+whitelist_externals = bash
                       htmlChecks.sh
                       get-remote-files.sh
                       git
 #                      hw-updates.sh
-whitelist_externals = {[testenv:docs]allowlist_externals}
+
 
 [testenv:api-ref]
 deps = {[testenv:docs]deps}
 commands =
   rm -rf api-ref/build
   sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html
-allowlist_externals = rm
+whitelist_externals = rm
-whitelist_externals = {[testenv:api-ref]allowlist_externals}
 
 [testenv:linters]
-allowlist_externals = bash
+whitelist_externals = bash
-whitelist_externals = {[testenv:linters]allowlist_externals}
 commands =
   bash -c "find {toxinidir}                   \
             \( -name .tox -prune \)           \
@@ -64,16 +64,14 @@ passenv=PWD
 commands =
        bash -c "echo Running in {env:PWD}"
        bash new-topic.sh {env:PWD} {toxinidir}
-allowlist_externals = new-topic.sh
+whitelist_externals = new-topic.sh
                       bash
-whitelist_externals = {[testenv:newfile]allowlist_externals}
 
 [testenv:picks]
 commands =
        ./pickCompare.sh
-allowlist_externals = pickCompare.sh
+whitelist_externals = pickCompare.sh
                       bash
-whitelist_externals = {[testenv:picks]allowlist_externals}
 
 
 [testenv:linkcheck]