From e1154bff2aeaab5f112ab65d23479581a3b7d0dd Mon Sep 17 00:00:00 2001
From: Brian Haley <haleyb.dev@gmail.com>
Date: Wed, 18 Sep 2024 12:24:22 -0400
Subject: [PATCH] Use py312 for all neutron jobs

There are three job definitions here for testing
neutron with the master branches of other projects,
specifically neutron-lib, oslo, and ovsdbapp. As
neutron is no longer testing py311 in its master
gate for 2025.1, start using the py312 versions
of these jobs so we can move forward.

Also moved the sqlalchemy job to start using py312
as well.

Also updated the testing runtime to include 3.12
and removed 3.8 based on 2025.1 governance [0].

[0] https://review.opendev.org/c/openstack/governance/+/926150

Depends-on: https://review.opendev.org/c/openstack/openstack-zuul-jobs/+/929823
Change-Id: I4b35ac8e3a0387a21e9d0383cdf5ffe68161ef54
---
 setup.cfg                 | 2 +-
 zuul.d/base.yaml          | 4 ++--
 zuul.d/job-templates.yaml | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 1d3bd0fb2b4..d6da3044cc6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,10 +15,10 @@ classifier =
     Operating System :: POSIX :: Linux
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
 
 [files]
 packages =
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 8ba236acda0..244b0b38103 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -234,9 +234,9 @@
         override-checkout: main
 
 - job:
-    name: openstack-tox-py311-with-sqlalchemy-master
+    name: openstack-tox-py312-with-sqlalchemy-master
     branches: ^master$
-    parent: openstack-tox-py311
+    parent: openstack-tox-py312
     required-projects:
       - name: github.com/sqlalchemy/sqlalchemy
         override-checkout: main
diff --git a/zuul.d/job-templates.yaml b/zuul.d/job-templates.yaml
index f803da28921..cd23d0a2eba 100644
--- a/zuul.d/job-templates.yaml
+++ b/zuul.d/job-templates.yaml
@@ -82,13 +82,13 @@
         - neutron-tempest-plugin-api-ovn-wsgi
         # Jobs added to the periodic queue by templates defined in
         # https://opendev.org/openstack/openstack-zuul-jobs/src/branch/master/zuul.d/project-templates.yaml
-        - openstack-tox-py311-with-neutron-lib-master:
+        - openstack-tox-py312-with-neutron-lib-master:
             timeout: 3600
             irrelevant-files:  *irrelevant-files
-        - openstack-tox-py311-with-oslo-master:
+        - openstack-tox-py312-with-oslo-master:
             timeout: 3600
             irrelevant-files:  *irrelevant-files
-        - openstack-tox-py311-with-ovsdbapp-master:
+        - openstack-tox-py312-with-ovsdbapp-master:
             timeout: 3600
             irrelevant-files:  *irrelevant-files
 
@@ -126,7 +126,7 @@
         - openstack-tox-py39-with-oslo-master:
             timeout: 3600
             irrelevant-files:  *irrelevant-files
-        - openstack-tox-py311-with-sqlalchemy-master:
+        - openstack-tox-py312-with-sqlalchemy-master:
             timeout: 3600
             irrelevant-files: *irrelevant-files
         - neutron-functional-with-oslo-master