Merge "Bump skip-level lower version to stable/zed"

zuul.d/grenade.yaml

@@ -374,14 +374,11 @@
     description: |
       Grenade job that skips a release, validating that deployers can skip
       specific releases as prescribed by our process.
-    # See background from gmann:
-    # https://review.opendev.org/c/openstack/manila/+/859875/1/zuul.d/grenade-jobs.yaml
-    branches: ^(?!stable/(pike|queens|rocky|stein|train|ussuri|victoria|wallaby|xena|zed)).*$
     vars:
       # Move this forward when master changes to a new skip-level-allowed
-      # target release. Right now, this is xena because master is zed.
+      # target release. Right now, this is Zed because master is Bobcat (2023.2).
-      # When master is A, this should become yoga, and so forth.
+      # When master is C, this should become Antelope (2023.1), and so forth.
-      grenade_from_branch: stable/yoga
+      grenade_from_branch: stable/zed
       grenade_localrc:
         NOVA_ENABLE_UPGRADE_WORKAROUND: True
 
@@ -391,13 +388,10 @@
     description: |
       Grenade job that skips a release, validating that deployers can skip
       specific releases as prescribed by our process.
-    # See background from gmann:
-    # https://review.opendev.org/c/openstack/manila/+/859875/1/zuul.d/grenade-jobs.yaml
-    branches: ^(?!stable/(pike|queens|rocky|stein|train|ussuri|victoria|wallaby|xena|zed)).*$
     vars:
       # Move this forward when master changes to a new skip-level-allowed
-      # target release. Right now, this is xena because master is zed.
+      # target release. Right now, this is Zed because master is Bobcat (2023.2).
-      # When master is A, this should become yoga, and so forth.
+      # When master is C, this should become Antelope (2023.1), and so forth.
-      grenade_from_branch: stable/yoga
+      grenade_from_branch: stable/zed
       grenade_localrc:
         NOVA_ENABLE_UPGRADE_WORKAROUND: True

zuul.d/job-templates.yaml

@@ -137,3 +137,22 @@
         - neutron-functional-with-oslo-master
         - neutron-ovs-tempest-with-oslo-master
         - neutron-ovn-tempest-ovs-release-with-oslo-master
+
+- project-template:
+    name: neutron-skip-level-jobs
+    # NOTE(ralonsoh): during Bobcat (non SLURP release), these
+    # jobs are not executed in the "check" queue.
+    #check:
+    #  jobs:
+    #    - neutron-ovs-grenade-multinode-skip-level:
+    #        voting: false
+    #    - neutron-ovn-grenade-multinode-skip-level:
+    #        voting: false
+    periodic:
+      jobs:
+        - neutron-ovs-grenade-multinode-skip-level
+        - neutron-ovn-grenade-multinode-skip-level
+    experimental:
+      jobs:
+        - neutron-ovs-grenade-multinode-skip-level
+        - neutron-ovn-grenade-multinode-skip-level

zuul.d/project.yaml

@@ -15,15 +15,12 @@
       - neutron-experimental-jobs
       - neutron-periodic-jobs
       - neutron-tox-override-jobs
+      - neutron-skip-level-jobs
     check:
       jobs:
         - neutron-functional-with-uwsgi
         - neutron-fullstack-with-uwsgi
         - neutron-ovs-grenade-multinode
-        - neutron-ovs-grenade-multinode-skip-level:
-            voting: false
-        - neutron-ovn-grenade-multinode-skip-level:
-            voting: false
         - neutron-ovs-grenade-dvr-multinode
         - neutron-ovs-tempest-multinode-full
         - neutron-ovs-tempest-dvr-ha-multinode-full