Limit tox version to <4

This patch limitis the tox version to <4 in stable/ussuri.

Related-Bug: #1999558
Change-Id: I9c62d429bb819336da05055fecd08e3816986bf8

3 files changed, 31 insertions, 21 deletions

diff --git a/playbooks/configure_functional_job.yaml b/playbooks/configure_functional_job.yaml
index c663b78637..560cd7eb4e 100644
--- a/playbooks/configure_functional_job.yaml
+++ b/playbooks/configure_functional_job.yaml
@@ -1,5 +1,7 @@
 - hosts: all
   roles:
-    - ensure-tox
+    - role: ensure-tox
+      vars:
+        ensure_tox_version: "<4"
     - setup_logdir
     - configure_functional_tests
diff --git a/playbooks/run_functional_job.yaml b/playbooks/run_functional_job.yaml
index e85c2eee96..55563bdfc7 100644
--- a/playbooks/run_functional_job.yaml
+++ b/playbooks/run_functional_job.yaml
@@ -6,5 +6,7 @@
       bindep_profile: test
       bindep_dir: "{{ zuul_work_dir }}"
     - test-setup
-    - ensure-tox
+    - role: ensure-tox
+      vars:
+        ensure_tox_version: "<4"
     - tox
diff --git a/tox.ini b/tox.ini
index 1616715358..e2982cff68 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist = docs,py37,pep8
 minversion = 3.2.0
-skipsdist = True
+skipsdist = False
 ignore_basepython_conflict = True
 
 [testenv]
@@ -12,15 +12,23 @@ setenv = VIRTUAL_ENV={envdir}
          OS_STDERR_CAPTURE={env:OS_STDERR_CAPTURE:true}
          OS_TEST_TIMEOUT={env:OS_TEST_TIMEOUT:180}
          PYTHONWARNINGS=default::DeprecationWarning,ignore::DeprecationWarning:distutils,ignore::DeprecationWarning:site
-passenv = TRACE_FAILONLY GENERATE_HASHES http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY TOX_ENV_SRC_MODULES
+passenv = TRACE_FAILONLY
+          GENERATE_HASHES
+          http_proxy
+          HTTP_PROXY
+          https_proxy
+          HTTPS_PROXY
+          no_proxy
+          NO_PROXY
+          TOX_ENV_SRC_MODULES
 usedevelop = True
 deps =
   -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
-whitelist_externals = sh
+allowlist_externals = bash
 commands =
-  {toxinidir}/tools/pip_install_src_modules.sh "{toxinidir}"
+  bash {toxinidir}/tools/pip_install_src_modules.sh "{toxinidir}"
   stestr run {posargs}
 
 # there is also secret magic in ostestr which lets you run in a fail only
@@ -62,7 +70,7 @@ setenv = {[testenv:functional]setenv}
 deps =
   {[testenv:functional]deps}
 commands =
-  {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin
+  bash {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin
   stestr run --group_regex=neutron\.tests\.functional\.db\.test_migrations\.(TestModelsMigrationsPsql|TestModelsMigrationsMysql) {posargs}
 
 [testenv:dsvm-fullstack]
@@ -78,16 +86,16 @@ setenv = {[testenv]setenv}
 deps =
   {[testenv:functional]deps}
 commands =
-  {toxinidir}/tools/generate_dhclient_script_for_fullstack.sh {envdir}
-  {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin
+  bash {toxinidir}/tools/generate_dhclient_script_for_fullstack.sh {envdir}
+  bash {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin
   stestr run --concurrency 3 {posargs}
 
 [testenv:dsvm-fullstack-gate]
 setenv = {[testenv:dsvm-fullstack]setenv}
 deps = {[testenv:dsvm-fullstack]deps}
 commands =
-  {toxinidir}/tools/generate_dhclient_script_for_fullstack.sh {envdir}
-  {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin
+  bash {toxinidir}/tools/generate_dhclient_script_for_fullstack.sh {envdir}
+  bash {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin
   stestr run --concurrency 3 --black-regex neutron.tests.fullstack.test_securitygroup.TestSecurityGroupsSameNetwork.test_securitygroup {posargs}
   stestr run --combine --concurrency 1 neutron.tests.fullstack.test_securitygroup.TestSecurityGroupsSameNetwork.test_securitygroup {posargs}
 
@@ -102,20 +110,18 @@ deps =
   {[testenv]deps}
 commands=
   # If it is easier to add a check via a shell script, consider adding it in this file
-  sh ./tools/misc-sanity-checks.sh
-  {toxinidir}/tools/check_unit_test_structure.sh
+  bash ./tools/misc-sanity-checks.sh
+  bash {toxinidir}/tools/check_unit_test_structure.sh
   # Checks for coding and style guidelines
   flake8
-  sh ./tools/coding-checks.sh --pylint '{posargs}'
+  bash ./tools/coding-checks.sh --pylint '{posargs}'
   neutron-db-manage --config-file neutron/tests/etc/neutron.conf check_migration
   python ./tools/list_moved_globals.py
   {[testenv:genconfig]commands}
   {[testenv:bashate]commands}
   {[testenv:bandit]commands}
   {[testenv:genpolicy]commands}
-whitelist_externals =
-  sh
-  bash
+allowlist_externals = bash
 
 [testenv:cover]
 envdir = {toxworkdir}/shared
@@ -146,7 +152,7 @@ commands = sphinx-build -W -b html doc/source doc/build/html
 [testenv:pdf-docs]
 envdir = {toxworkdir}/docs
 deps = {[testenv:docs]deps}
-whitelist_externals =
+allowlist_externals =
   make
 commands =
   sphinx-build -W -b latex doc/source doc/build/pdf
@@ -204,7 +210,7 @@ commands = bash -c "find {toxinidir}             \
 
 [testenv:genconfig]
 envdir = {toxworkdir}/shared
-commands = {toxinidir}/tools/generate_config_file_samples.sh
+commands = bash {toxinidir}/tools/generate_config_file_samples.sh
 
 [testenv:genpolicy]
 envdir = {toxworkdir}/shared
@@ -223,6 +229,6 @@ commands = bindep test
 [testenv:requirements]
 deps =
   -egit+https://opendev.org/openstack/requirements#egg=openstack-requirements
-whitelist_externals = sh
+allowlist_externals = bash
 commands =
-    sh -c '{envdir}/src/openstack-requirements/playbooks/files/project-requirements-change.py --req {envdir}/src/openstack-requirements --local {toxinidir} master'
+    bash -c '{envdir}/src/openstack-requirements/playbooks/files/project-requirements-change.py --req {envdir}/src/openstack-requirements --local {toxinidir} master'