From 823eb77939071fb64422453edea2f17911e89c26 Mon Sep 17 00:00:00 2001
From: Brian Rosmaita <rosmaita.fossdev@gmail.com>
Date: Wed, 10 Apr 2024 09:15:16 -0400
Subject: [PATCH] Update CI for Dalmatian

Updates:
- run py311 func job in gate (was py310)
- add py312 testenvs to tox.ini
- did not remove py38 testenvs from tox.ini
- removed py38 classifier from setup.cfg, but did not change
  python_requires (currently it's >=3.8)

Python 3.12 unit tests will run non-voting in the gate as part of the
openstack-python3-jobs template.  Python 3.10 coverage is being handled
by tempest running in Ubuntu 22.04.

Change-Id: I72ec22780d36ea3e56386ae2bd74bf5b9806731c
---
 .zuul.yaml | 2 +-
 setup.cfg  | 1 -
 tox.ini    | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 06e3dfcfb7b..46ca7e13823 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -24,7 +24,7 @@
               - ^doc/.*$
               - ^releasenotes/.*$
               - ^reno.yaml$
-        - openstack-tox-functional-py310:
+        - openstack-tox-functional-py311:
             irrelevant-files: *functional-irrelevant-files
         - cinder-rally-task:
             voting: false
diff --git a/setup.cfg b/setup.cfg
index 1f6fadeb347..3c9051d6b4d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,6 @@ classifiers =
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
diff --git a/tox.ini b/tox.ini
index 7d73bc07471..8ee5d6829ee 100644
--- a/tox.ini
+++ b/tox.ini
@@ -42,7 +42,7 @@ passenv =
   *_proxy
   *_PROXY
 
-[testenv:py{3,38,39,310,311}]
+[testenv:py{3,38,39,310,311,312}]
 # NOTE: Do not move the constraints from the install_command into deps, as that
 #       may result in tox using unconstrained/untested dependencies.
 #       We use "usedevelop = True" for tox jobs (except bindep), so tox does 2
@@ -62,7 +62,7 @@ install_command = {[testenv:py3]install_command}
 setenv =
   OS_TEST_PATH = ./cinder/tests/functional
 
-[testenv:functional-py{3,38,39,310,311}]
+[testenv:functional-py{3,38,39,310,311,312}]
 install_command = {[testenv:functional]install_command}
 setenv =
   {[testenv:functional]setenv}