From 863a01b03286e6595d68ac7f2560c857bcf944c5 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Thu, 17 Nov 2022 15:42:17 -0600
Subject: [PATCH] Temporary pin the ceph jobs nodeset to Focal

As per the community wide goal to migrate the CI/CD from
Ubuntu Focal to Ubuntu jammy, we need to merge the devstack, tox base
jobs to jammy on Nov 18. But ceph jobs are failing on Ubuntu Jammy.

To move ahead to merge the base job patches we need to pin the
ceph jobs nodeset to Focal until this is fixed for Jammy.

Since the devstack-plugin-ceph-tempest-py3 is currently permanently
failing, although this patch is a no-op, make it non-voting. Also don't
run 100% failing non-voting jobs until they are fixed.

Needed-By: https://review.opendev.org/c/openstack/devstack/+/860795

Related-bug: #1996628
Change-Id: Id2ae61979505de5efb47ce90a2bac8aac2fc5484
---
 .zuul.yaml | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 14ecbfbd..115194ab 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,6 +2,9 @@
     name: devstack-plugin-ceph-tempest-py3-base
     abstract: true
     parent: tempest-full-py3
+    # TODO: Remove the nodeset pinning to focal once below bug is fixed
+    # https://bugs.launchpad.net/devstack-plugin-ceph/+bug/1996628
+    nodeset: openstack-single-node-focal
     description: |
       Base integration tests that runs with the ceph devstack plugin and py3.
       Former names for this job where:
@@ -105,6 +108,9 @@
     description: |
       Integration tests that runs the ceph device plugin across multiple
       nodes on py3.
+    # TODO: Remove the nodeset pinning to focal once below bug is fixed
+    # https://bugs.launchpad.net/devstack-plugin-ceph/+bug/1996628
+    nodeset: openstack-two-node-focal
     required-projects:
       - openstack/cinder-tempest-plugin
       - openstack/devstack-plugin-ceph
@@ -163,24 +169,25 @@
       Runs devstack-plugin-ceph-tempest jobs.
     check:
       jobs:
-        - devstack-plugin-ceph-tempest-py3
+        - devstack-plugin-ceph-tempest-py3:
+            voting: false
         - devstack-plugin-ceph-tempest-cephadm:
             voting: false
         - devstack-plugin-ceph-cephfs-native:
             irrelevant-files: *irrelevant-files
             voting: false
-        - devstack-plugin-ceph-cephfs-nfs:
-            irrelevant-files: *irrelevant-files
-            voting: false
-        - devstack-plugin-ceph-tempest-fedora-latest
-        - devstack-plugin-ceph-multinode-tempest-py3
-        - devstack-plugin-ceph-multinode-tempest-cephadm:
-            voting: false
-        - devstack-plugin-ceph-master-tempest:
-            voting: false
-    gate:
-      jobs:
-        - devstack-plugin-ceph-tempest-py3
+        # - devstack-plugin-ceph-cephfs-nfs:
+        #     irrelevant-files: *irrelevant-files
+        #     voting: false
+        # - devstack-plugin-ceph-tempest-fedora-latest
+        # - devstack-plugin-ceph-multinode-tempest-py3
+        # - devstack-plugin-ceph-multinode-tempest-cephadm:
+        #     voting: false
+        # - devstack-plugin-ceph-master-tempest:
+        #     voting: false
+    # gate:
+    #   jobs:
+    #     - devstack-plugin-ceph-tempest-py3
 
 - project:
     templates: