From 650b5c5b8e08e7656a215048c0ee43117ccdcf2d Mon Sep 17 00:00:00 2001
From: Brian Rosmaita <rosmaita.fossdev@gmail.com>
Date: Mon, 23 Feb 2026 18:33:37 -0500
Subject: [PATCH] Update CI for Gazpacho

Add Python 3.13 functional tests, as per
https://governance.openstack.org/tc/reference/runtimes/2026.1.html

Given that our functional tests are devstack-based, the python 3.10
functional job is made non-voting because there is no supported
py3.10 platform for devstack following change I796eddac96313584f4a.

Change-Id: If75514f573ea16f7984919f4380ddd99f282a85a
Signed-off-by: Brian Rosmaita <rosmaita.fossdev@gmail.com>
---
 .zuul.yaml | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index dec90e3da..fbc442f4a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,6 +2,12 @@
     name: python-cinderclient-functional-base
     abstract: true
     parent: devstack-tox-functional
+    description: |
+      Abstract job for defining devstack-based functional test jobs for
+      python-cinderclient.  Jobs for particular python versions use this
+      job as a parent, and control what verison of python is used by
+      specifying a nodeset having the desired version of python as the
+      system default.
     timeout: 4500
     required-projects:
       - openstack/cinder
@@ -25,17 +31,23 @@
     # Python 3.10 is the default on Ubuntu 22.04 (Jammy)
     nodeset: openstack-single-node-jammy
     vars:
-      python_version: 3.10
+      devstack_localrc:
+        # current master devstack no longer supports jammy as a platform
+        # (change I796eddac96313584f4a), so we must force install it
+        FORCE: 'yes'
+      bindep_profile: test py310
+      python_version: '3.10'
       tox_envlist: functional-py310
 
 - job:
-    name: python-cinderclient-functional-py312
+    name: python-cinderclient-functional-py313
     parent: python-cinderclient-functional-base
-    # Python 3.12 is the default on Ubuntu 24.04 (Noble)
-    nodeset: openstack-single-node-noble
+    # Python 3.13 is the default on Debian Trixie
+    nodeset: devstack-single-node-debian-trixie
     vars:
-      python_version: 3.12
-      tox_envlist: functional-py312
+      bindep_profile: test py310
+      python_version: '3.13'
+      tox_envlist: functional-py313
 
 - project:
     vars:
@@ -49,11 +61,13 @@
       - release-notes-jobs-python3
     check:
       jobs:
-        - python-cinderclient-functional-py310
-        - python-cinderclient-functional-py312
+        - python-cinderclient-functional-py310:
+            # non-voting because devstack support on python 3.10
+            # is no longer tested (see change I796eddac96313584f4a)
+            voting: false
+        - python-cinderclient-functional-py313
         - openstack-tox-pylint:
             voting: false
     gate:
       jobs:
-        - python-cinderclient-functional-py310
-        - python-cinderclient-functional-py312
+        - python-cinderclient-functional-py313