From 00ec88ed8e685b8aeeedf4dbcb94383a1278d1a0 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 5 May 2023 15:20:16 -0700
Subject: [PATCH] Fix gerritbot CI

This is fallout from the v4 and default nodeset updates.

Change-Id: I11b1c979767aeda64c9436e407b4627cc0d0b16f
---
 .zuul.yaml |  6 ++++--
 tox.ini    | 13 ++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 427ee77..e8b0fda 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -62,14 +62,16 @@
     check:
       jobs:
         - tox-pep8
-        - tox-py38
+        - tox-py38:
+            nodeset: ubuntu-focal
         - tox-py310:
             nodeset: ubuntu-jammy
         - gerritbot-build-opendev-image
     gate:
       jobs:
         - tox-pep8
-        - tox-py38
+        - tox-py38:
+            nodeset: ubuntu-focal
         - tox-py310:
             nodeset: ubuntu-jammy
         - gerritbot-upload-opendev-image
diff --git a/tox.ini b/tox.ini
index 345f6ac..1788539 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,9 @@
 [tox]
-envlist = py38,pep8
+envlist = py310,py38,pep8
 
 [testenv]
 usedevelop = True
 install_command = pip install {opts} {packages}
-basepython = python3
 setenv = VIRTUAL_ENV={envdir}
          PYTHONDONTWRITEBYTECODE = 1
          LANGUAGE=en_US
@@ -12,12 +11,16 @@ setenv = VIRTUAL_ENV={envdir}
          PYTHONWARNINGS=default::DeprecationWarning
          TESTS_DIR=./gerritbot/tests/unit/
 deps = -r{toxinidir}/test-requirements.txt
-whitelist_externals = rm
+allowlist_externals = rm
 commands =
     rm -f .testrepository/times.dbm
     stestr run {posargs}
-passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
-
+passenv = http_proxy
+          HTTP_PROXY
+          https_proxy
+          HTTPS_PROXY
+          no_proxy
+          NO_PROXY
 
 [testenv:pep8]
 commands = flake8