From fb9437ca25fcffbef3f14ba9432ea184df9d71fc Mon Sep 17 00:00:00 2001
From: Brian Haley <haleyb.dev@gmail.com>
Date: Tue, 31 Oct 2023 15:16:37 -0400
Subject: [PATCH] Use py311 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 py310 in its master
gate, start using the py311 versions of these jobs
so we can move forward.

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

Depends-on: https://review.opendev.org/c/openstack/openstack-zuul-jobs/+/899745
Change-Id: Iec1d5fcdfd8c85a3edb5bc9a399d44839fbc879a
---
 zuul.d/base.yaml          | 13 +++++++++++++
 zuul.d/job-templates.yaml |  8 ++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 7ac0ee010cd..1a2939657c0 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -222,6 +222,7 @@
       - name: github.com/sqlalchemy/alembic
         override-checkout: main
 
+# TODO(ykarel) remove once https://review.opendev.org/901009 merges
 - job:
     name: openstack-tox-py310-with-sqlalchemy-master
     branches: ^master$
@@ -234,6 +235,18 @@
       - name: github.com/sqlalchemy/alembic
         override-checkout: main
 
+- job:
+    name: openstack-tox-py311-with-sqlalchemy-master
+    branches: ^master$
+    parent: openstack-tox-py311
+    required-projects:
+      - name: github.com/sqlalchemy/sqlalchemy
+        override-checkout: main
+      - openstack/oslo.db
+      - openstack/neutron-lib
+      - name: github.com/sqlalchemy/alembic
+        override-checkout: main
+
 - job:
     name: neutron-fullstack-with-uwsgi-fips
     parent: neutron-fullstack-with-uwsgi
diff --git a/zuul.d/job-templates.yaml b/zuul.d/job-templates.yaml
index ef4c079a5ed..57b9740b0b7 100644
--- a/zuul.d/job-templates.yaml
+++ b/zuul.d/job-templates.yaml
@@ -29,7 +29,7 @@
         - openstack-tox-cover:  # from openstack-cover-jobs template
             timeout: 4800
             irrelevant-files:  *irrelevant-files
-        - openstack-tox-py310-with-sqlalchemy-master:
+        - openstack-tox-py311-with-sqlalchemy-master:
             timeout: 3600
             irrelevant-files: *irrelevant-files
     check-arm64:
@@ -74,13 +74,13 @@
         - neutron-ovn-tempest-with-uwsgi-loki
         # 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-py310-with-neutron-lib-master:
+        - openstack-tox-py311-with-neutron-lib-master:
             timeout: 3600
             irrelevant-files:  *irrelevant-files
-        - openstack-tox-py310-with-oslo-master:
+        - openstack-tox-py311-with-oslo-master:
             timeout: 3600
             irrelevant-files:  *irrelevant-files
-        - openstack-tox-py310-with-ovsdbapp-master:
+        - openstack-tox-py311-with-ovsdbapp-master:
             timeout: 3600
             irrelevant-files:  *irrelevant-files