From 13b24042a1aa9fb0fcaa36ba13df12e291a0b8eb Mon Sep 17 00:00:00 2001
From: Al Bailey <al.bailey@windriver.com>
Date: Mon, 26 Dec 2022 22:07:34 +0000
Subject: [PATCH] Update tox.ini to work with tox 4

This change will allow this repo to pass zuul now
that this has merged:
https://review.opendev.org/c/zuul/zuul-jobs/+/866943

Tox 4 deprecated whitelist_externals.
Replace whitelist_externals with allowlist_externals

Removed the 'build' target from zuul which just invokes
the devstack script which is un-supported.

Partial-Bug: #2000399

Signed-off-by: Al Bailey <al.bailey@windriver.com>
Change-Id: I59bd7c82c297e12969e31b5de9ac02d2a47834a6
---
 .zuul.yaml | 14 --------------
 tox.ini    | 12 ++++++------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 61b185ef..3afb8ecc 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -12,7 +12,6 @@
         - openstack-tox-linters
         - openstack-tox-pep8
         - fault-tox-pylint
-        - stx-fault-build
         - fault-rest-api-py27
         - fault-rest-api-py39
     gate:
@@ -26,19 +25,6 @@
       jobs:
         - stx-fault-upload-git-mirror
 
-
-# Perform just a build
-- job:
-    name: stx-fault-build
-    parent: tox
-    description: Run build for fault
-    irrelevant-files:
-      - api-ref/*
-      - docs/*
-      - releasenotes/*
-    vars:
-      tox_envlist: build
-
 - job:
     name: flock-devstack-fault
     parent: flock-devstack-base-min
diff --git a/tox.ini b/tox.ini
index 5ea6de46..47b67264 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,7 @@ setenv =
     VIRTUAL_ENV={envdir}
     LC_ALL=en_US.utf-8
 deps = -r{toxinidir}/test-requirements.txt
-whitelist_externals = bash
+allowlist_externals = bash
 commands =
   bash -c 'if [ -d {toxinidir}/../zuul-jobs ]; then \
          find .           \
@@ -33,7 +33,7 @@ commands =
 
 [testenv:linters]
 basepython = python3
-whitelist_externals = bash
+allowlist_externals = bash
 commands =
   bash -c "find {toxinidir}          \
          -not \( -type d -name .?\* -prune \) \
@@ -120,7 +120,7 @@ deps = -r{toxinidir}/doc/requirements.txt
 commands =
     rm -rf doc/build
     sphinx-build -a -E -W -d doc/build/doctrees -b html doc/source doc/build/html
-whitelist_externals = rm
+allowlist_externals = rm
 
 [testenv:releasenotes]
 basepython = python3
@@ -128,7 +128,7 @@ deps = -r{toxinidir}/doc/requirements.txt
 commands =
     rm -rf releasenotes/build
     sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
-whitelist_externals =
+allowlist_externals =
     rm
     reno
 
@@ -146,7 +146,7 @@ deps =
 commands =
   rm -rf api-ref/build
   sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html
-whitelist_externals = rm
+allowlist_externals = rm
 
 [testenv:build]
 deps =
@@ -154,7 +154,7 @@ commands = {toxinidir}/devstack/build.sh
 
 [testenv:functional]
 basepython = python3
-whitelist_externals = cat
+allowlist_externals = cat
 commands = cat /etc/fm/fm.conf
 
 [testenv:bandit]