From 550b0f0d8feebcb238157ef1995bfb8b07fe7397 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Mon, 21 Oct 2024 19:54:27 -0700
Subject: [PATCH] Update gate jobs as per the 2025.1 cycle testing runtime

As per 2025.1 testing runtime[1], we need to test on Ubuntu
Noble (which will be taken care by tempest and devstack [2]
patches to move base jobs to Noble) and at least single job to run on
Ubuntu Jammy (for smooth upgrade from previous releases).

This commit adds a new job to run on Jammy which can be removed
in future cycle when testing runtime test next version of Ubuntu
as default.

Also bump the hacking version to fix the pepe8 erorr:
 -AttributeError: 'EntryPoints' object has no attribute 'get'

[1] https://governance.openstack.org/tc/reference/runtimes/2025.1.html
[2] https://review.opendev.org/c/openstack/tempest/+/932156

Change-Id: Ia29391d5535b16589d7cf259f958b3b6aac5776c
---
 test-requirements.txt |  2 +-
 zuul.d/jobs.yaml      | 15 ++++++++++++---
 zuul.d/nodesets.yaml  | 22 ++++++++++++++++------
 zuul.d/projects.yaml  |  2 ++
 4 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index d01d750175..1d429a7d72 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1,5 @@
 # Hacking already pins down pep8, pyflakes and flake8
-hacking<6.0.0 # Apache-2.0
+hacking>=7.0.0,<7.1.0 # Apache-2.0
 bandit[baseline]>=1.7.7 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 WebTest>=2.0.27 # MIT
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index db119cc735..145be16cdf 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -23,7 +23,7 @@
 - job:
     name: trove-tempest
     parent: devstack-tempest
-    nodeset: trove-ubuntu-jammy
+    nodeset: trove-ubuntu-noble
     timeout: 10800
     required-projects: &base_required_projects
       - openstack/trove
@@ -182,6 +182,15 @@
               database:
                 default_datastore_versions: mysql:5.7
 
+# TODO(gmann): As per the 2025.1 testing runtime, we need to run at least
+# one job on jammy. This job can be removed as per the future testing
+# runtime (whenever we start testing Ubuntu 26.04 as default version).
+- job:
+    name: trove-tempest-ubuntu-base-mysql5.7-jammy
+    description: This is integrated job testing on Ubuntu jammy(22.04)
+    parent: trove-tempest-ubuntu-base-mysql5.7
+    nodeset: trove-ubuntu-jammy
+
 - job:
     name: trove-tempest-ubuntu-backup-mysql5.7
     parent: trove-tempest-ubuntu-backup
@@ -421,7 +430,7 @@
 - job:
     name: trove-ubuntu-guest-image-build
     run: playbooks/image-build/run.yaml
-    nodeset: trove-ubuntu-jammy-single
+    nodeset: trove-ubuntu-noble-single
     timeout: 3600
     description: |
       Build Ubuntu jammy based image only on ubuntu distro.
@@ -474,6 +483,6 @@
     run: playbooks/image-build/docker-registry.yaml
     parent: publish-openstack-artifacts
     post-run: playbooks/image-build/post.yaml
-    nodeset: trove-ubuntu-jammy-single
+    nodeset: trove-ubuntu-noble-single
     required-projects:
       - openstack/trove
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 6fc1a94a2a..6475a2d7be 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -1,3 +1,19 @@
+- nodeset:
+    name: trove-ubuntu-noble
+    nodes:
+      - name: controller
+        label: nested-virt-ubuntu-noble
+    groups:
+      - name: tempest
+        nodes:
+          - controller
+
+- nodeset:
+    name: trove-ubuntu-noble-single
+    nodes:
+      - name: primary
+        label: ubuntu-noble
+
 - nodeset:
     name: trove-ubuntu-jammy
     nodes:
@@ -7,9 +23,3 @@
       - name: tempest
         nodes:
           - controller
-
-- nodeset:
-    name: trove-ubuntu-jammy-single
-    nodes:
-      - name: primary
-        label: ubuntu-jammy
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 601d99091c..c735394f91 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -12,6 +12,7 @@
     check:
       jobs:
         - trove-tempest-ubuntu-base-mysql5.7
+        - trove-tempest-ubuntu-base-mysql5.7-jammy
         - trove-tempest-ubuntu-backup-mysql5.7:
             voting: false
         - trove-tempest-ubuntu-replication-mysql5.7:
@@ -35,6 +36,7 @@
     gate:
       jobs:
         - trove-tempest-ubuntu-base-mysql5.7
+        - trove-tempest-ubuntu-base-mysql5.7-jammy
         - trove-tempest-ubuntu-base-mariadb10.4
         - trove-tempest-ubuntu-base-postgresql12
     experimental: