From 5a9cc7cd828087467e05ca638c9cc4d8d3aa8e6c Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Thu, 10 Oct 2024 20:17:56 -0700
Subject: [PATCH] Migrate OpenStack tox base jobs to Ubuntu Noble (24.04)

As per 2025.1 testing runtime[1], we need to move gate
test jobs on Ubuntu Noble (24.04).

OpenStack tox base jobs are migrated to ubuntu Noble for
2025.1 onwards.

tox doc jobs are failing with multiple issues which can take
time to fix. To migrate all other jobs on time, we will migrate
the doc job to Noble later.

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

Change-Id: I8fa921729b729a54966302e0d291a48996439947
---
 zuul.d/jobs.yaml | 85 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 77 insertions(+), 8 deletions(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 47678550..a6f50f75 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -3,6 +3,24 @@
 #    https://opendev.org/openstack/project-config
 #    https://opendev.org/zuul/zuul-jobs
 
+- job:
+    name: openstack-tox
+    abstract: true
+    parent: tox-fips
+    nodeset: ubuntu-noble
+    description: |
+      Base job to run tox jobs with OpenStack project specific updates.
+
+      Processing upper-constraints files from openstack/requirements.
+    branches:
+      regex: ^*/(victoria|wallaby|xena|yoga|zed|2023.1|2023.2|2024.1|2024.2)$
+      negate: true
+    required-projects:
+      - name: openstack/requirements
+    vars:
+      tox_constraints_file: '{{ ansible_user_dir }}/src/opendev.org/openstack/requirements/upper-constraints.txt'
+      enable_fips: false
+
 - job:
     name: openstack-tox
     abstract: true
@@ -13,8 +31,10 @@
 
       Processing upper-constraints files from openstack/requirements.
     branches:
-      regex: ^stable/(victoria|wallaby|xena|yoga|zed)$
-      negate: true
+      - ^.*/2023.1
+      - ^.*/2023.2
+      - ^.*/2024.1
+      - ^.*/2024.2
     required-projects:
       - name: openstack/requirements
     vars:
@@ -454,6 +474,24 @@
       bindep_profile: test pep8
       test_setup_skip: true
 
+- job:
+    name: openstack-tox-cover
+    parent: tox-cover
+    description: |
+      Run code coverage tests.
+
+      Uses tox with the ``cover`` environment.
+    nodeset: ubuntu-noble
+    branches:
+      regex: ^.*/(victoria|wallaby|xena|yoga|zed|2023.1|2023.2|2024.1|2024.2)$
+      negate: true
+    required-projects:
+      - name: openstack/requirements
+    irrelevant-files: *common-irrelevant-files
+    vars:
+      tox_constraints_file: '{{ ansible_user_dir }}/src/opendev.org/openstack/requirements/upper-constraints.txt'
+    timeout: 3000
+
 - job:
     name: openstack-tox-cover
     parent: tox-cover
@@ -463,8 +501,10 @@
       Uses tox with the ``cover`` environment.
     nodeset: ubuntu-jammy
     branches:
-      regex: ^.*/(victoria|wallaby|xena|yoga|zed)$
-      negate: true
+      - ^.*/2023.1
+      - ^.*/2023.2
+      - ^.*/2024.1
+      - ^.*/2024.2
     required-projects:
       - name: openstack/requirements
     irrelevant-files: *common-irrelevant-files
@@ -519,6 +559,21 @@
     vars:
       tox_envlist: build
 
+- job:
+    name: openstack-tox-functional
+    parent: openstack-tox
+    description: |
+      Run tox-based functional tests for an OpenStack Python project.
+
+      Uses tox with the ``functional`` environment.
+    irrelevant-files: *common-irrelevant-files
+    nodeset: ubuntu-noble
+    branches:
+      regex: ^.*/(victoria|wallaby|xena|yoga|zed|2023.1|2023.2|2024.1|2024.2)$
+      negate: true
+    vars:
+      tox_envlist: functional
+
 - job:
     name: openstack-tox-functional
     parent: openstack-tox
@@ -529,8 +584,7 @@
     irrelevant-files: *common-irrelevant-files
     nodeset: ubuntu-jammy
     branches:
-      regex: ^.*/(victoria|wallaby|xena|yoga|zed)$
-      negate: true
+      regex: ^.*/(2023.1|2023.2|2024.1|2024.2)$
     vars:
       tox_envlist: functional
 
@@ -550,6 +604,22 @@
     vars:
       tox_envlist: functional
 
+- job:
+    name: openstack-tox-functional-with-sudo
+    parent: openstack-tox-with-sudo
+    description: |
+      Run tox-based functional tests for an OpenStack Python project.
+
+      Uses tox with the ``functional`` environment.
+      Sudo access is not revoked.
+    irrelevant-files: *common-irrelevant-files
+    nodeset: ubuntu-noble
+    branches:
+      regex: ^.*/(victoria|wallaby|xena|yoga|zed|2023.1|2023.2|2024.1|2024.2)$
+      negate: true
+    vars:
+      tox_envlist: functional
+
 - job:
     name: openstack-tox-functional-with-sudo
     parent: openstack-tox-with-sudo
@@ -561,8 +631,7 @@
     irrelevant-files: *common-irrelevant-files
     nodeset: ubuntu-jammy
     branches:
-      regex: ^.*/(victoria|wallaby|xena|yoga|zed)$
-      negate: true
+      regex: ^.*/(2023.1|2023.2|2024.1|2024.2)$
     vars:
       tox_envlist: functional