From 58500c9967c3286c97f0a1056e94d1b2f05000d7 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Wed, 12 Oct 2022 16:16:21 -0500
Subject: [PATCH] Update gate jobs as per the 2023.1 cycle testing runtime

As per 2023.1 testing runtime[1], we need to test on Ubuntu
Jammy (which will be taken care by tempest and devstack patches
to move base jobs to Jammy) and at least single job to run on
Ubutnu Focal (for smooth upgrade). Also, python 3.10 testing is
voting now.

This commit adds a new job to run on focal which can be removed
in future cycle when testing runtime drop the requirement of Focal
testing. Also, make python 3.10 functional and unit test job as voting
(openstack-tox-py310 is running as part of generic template so we do
not need to explicitly add that)

[1] https://governance.openstack.org/tc/reference/runtimes/2023.1.html

Change-Id: Ia43f73dba00b0b5932939bcc7d11b97a83072ee3
---
 .zuul.yaml | 18 ++++++++++++++----
 setup.cfg  |  1 +
 tox.ini    |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 073483b750..68c366c944 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -655,6 +655,15 @@
             image_conversion:
               output_format: raw
 
+# TODO(gmann): As per the 2023.1 testing runtime, we need to run at least
+# one job on Focal. This job can be removed as per the future testing
+# runtime (whenever we drop the Ubuntu Focal testing).
+- job:
+    name: tempest-integrated-compute-ubuntu-focal
+    description: This is integrated compute job testing on Ubuntu Focal(20.04)
+    parent: tempest-integrated-compute
+    nodeset: openstack-single-node-focal
+
 - project:
     # Please try to keep the list of job names sorted alphabetically.
     templates:
@@ -691,10 +700,7 @@
             voting: false
         - nova-tox-functional-py38
         - nova-tox-functional-py39
-        - nova-tox-functional-py310:
-            voting: true
-        - openstack-tox-py310:
-            voting: true
+        - nova-tox-functional-py310
         - tempest-integrated-compute:
            # NOTE(gmann): Policies changes do not need to run all the
            # integration test jobs. Running only tempest and grenade
@@ -714,6 +720,8 @@
              - ^setup.cfg$
              - ^tools/.*$
              - ^tox.ini$
+        - tempest-integrated-compute-ubuntu-focal:
+            irrelevant-files: *policies-irrelevant-files
         - grenade-skip-level:
             irrelevant-files: *policies-irrelevant-files
         - nova-grenade-multinode:
@@ -747,6 +755,8 @@
               - ^(?!nova/network/.*)(?!nova/virt/libvirt/vif.py).*$
         - tempest-integrated-compute:
            irrelevant-files: *policies-irrelevant-files
+        - tempest-integrated-compute-ubuntu-focal:
+            irrelevant-files: *policies-irrelevant-files
         - nova-grenade-multinode:
            irrelevant-files: *policies-irrelevant-files
         - tempest-ipv6-only:
diff --git a/setup.cfg b/setup.cfg
index 58594e229c..fa6f6af656 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,6 +22,7 @@ classifiers =
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: Implementation :: CPython
 
diff --git a/tox.ini b/tox.ini
index edb08599e7..60315b507c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.18.0
-envlist = py39,functional,pep8
+envlist = py3,functional,pep8
 # Automatic envs (pyXX) will only use the python version appropriate to that
 # env and ignore basepython inherited from [testenv] if we set
 # ignore_basepython_conflict.