Merge "Inclusive jargon"

.zuul.yaml

@@ -172,7 +172,7 @@
         - 'heat_tempest_plugin'
         - 'designate_tempest_plugin'
         - 'barbican_tempest_plugin'
-      black_regex:
+      exclude_regex:
         - 'heat_tempest_plugin.tests.functional.test_nova_server_networks.CreateServerTest.test_create_update_server_with_subnet'
         - 'heat_tempest_plugin.tests.scenario.test_volumes.VolumeBackupRestoreIntegrationTest.test_cinder_volume_create_backup_restore'
         - 'heat_tempest_plugin.tests.scenario.test_server_software_config.SoftwareConfigIntegrationTest.test_server_software_config'
@@ -238,7 +238,7 @@
       tempest_concurrency: 1
       # skip until https://storyboard.openstack.org/#!/story/2004209
       # is resolved
-      tempest_black_regex: 'tempest.api.compute.servers'
+      tempest_exclude_regex: 'tempest.api.compute.servers'
 
 - job:
     name: python-tempestconf-tempest-devstack-demo-train

playbooks/python-tempestconf-tempest-devstack.yaml

@@ -69,4 +69,4 @@
           vars:
             tox_envlist: "all"
             tempest_test_regex: "{{ test_regex|join('|') }}"
-            tempest_black_regex: "{{ black_regex|join('|') }}"
+            tempest_exclude_regex: "{{ exclude_regex|join('|') }}"

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-minversion = 3.1.1
+minversion = 3.18.0
 envlist = py38,py37,py36,pypy,pep8
 skipsdist = True
 # this allows tox to infer the base python from the environment name
@@ -13,7 +13,7 @@ install_command = pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.opens
 setenv =
    VIRTUAL_ENV={envdir}
    PYTHONWARNINGS=default::DeprecationWarning
-whitelist_externals = *
+allowlist_externals = *
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
@@ -46,7 +46,7 @@ commands = sphinx-build -b html doc/source doc/build/html
 
 [testenv:pdf-docs]
 deps = {[testenv:docs]deps}
-whitelist_externals =
+allowlist_externals =
    make
 commands =
    sphinx-build -W -b latex doc/source doc/build/pdf