From 89dd9025c7fd413df76489ac7579bb8f4283941c Mon Sep 17 00:00:00 2001
From: Al Bailey <al.bailey@windriver.com>
Date: Tue, 27 Dec 2022 01:22:00 +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

py39 jobs were failing due to how tox 4 skipsdist
behaves.  Therefore zuul is pinned to be < 4

Partial-Bug: #2000399

Signed-off-by: Al Bailey <al.bailey@windriver.com>
Change-Id: Ia5445a144ac7b33c811727d5846ff2f44b787ca9
---
 .zuul.yaml                             | 2 ++
 python-k8sapp-oidc/k8sapp_oidc/tox.ini | 2 +-
 tox.ini                                | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index b5853bb..13c7579 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,5 +1,7 @@
 ---
 - project:
+    vars:
+      ensure_tox_version: '<4'
     check:
       jobs:
         - openstack-tox-linters
diff --git a/python-k8sapp-oidc/k8sapp_oidc/tox.ini b/python-k8sapp-oidc/k8sapp_oidc/tox.ini
index 144e430..8623bf7 100644
--- a/python-k8sapp-oidc/k8sapp_oidc/tox.ini
+++ b/python-k8sapp-oidc/k8sapp_oidc/tox.ini
@@ -17,7 +17,7 @@ usedevelop = True
 sitepackages = False
 
 # tox is silly... these need to be separated by a newline....
-whitelist_externals = bash
+allowlist_externals = bash
                       find
 
 install_command = pip install \
diff --git a/tox.ini b/tox.ini
index 072d3d3..e0214d6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ setenv =
 deps =
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
-whitelist_externals =
+allowlist_externals =
   bash
 
 passenv =