From 10dc42b30529c5284a35a6b9546ddc0a5528f091 Mon Sep 17 00:00:00 2001
From: Martin Kopec <mkopec@redhat.com>
Date: Mon, 4 Jan 2021 14:16:09 +0000
Subject: [PATCH] Inclusive jargon

To follow tempest's change [1] regarding the inclusive jargon,
the patch renames arguments for tempest zuul jobs.
Also a tox version is bumped so that we can use the newer
tox options.

[1] https://review.opendev.org/c/openstack/tempest/+/768583

Change-Id: Ifa0ae749904093810d95af2ec8e006e1cce20f86
---
 .zuul.yaml                                         | 4 ++--
 playbooks/python-tempestconf-tempest-devstack.yaml | 2 +-
 tox.ini                                            | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 9f8cb7cf..e7c5e6bd 100644
--- a/.zuul.yaml
+++ b/.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
diff --git a/playbooks/python-tempestconf-tempest-devstack.yaml b/playbooks/python-tempestconf-tempest-devstack.yaml
index 59cee4ab..a51927b3 100644
--- a/playbooks/python-tempestconf-tempest-devstack.yaml
+++ b/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('|') }}"
diff --git a/tox.ini b/tox.ini
index f153f9f9..28a917d6 100644
--- a/tox.ini
+++ b/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