Merge "Add octavia-grenade-slurp CI job"

zuul.d/jobs.yaml

@@ -42,13 +42,13 @@
     name: octavia-grenade
     parent: grenade
     nodeset: octavia-single-node-ubuntu-focal
-    required-projects:
+    required-projects: &o-grenade-required-projects
       - opendev.org/openstack/grenade
       - opendev.org/openstack/octavia
       - opendev.org/openstack/octavia-lib
       - opendev.org/openstack/octavia-tempest-plugin
       - opendev.org/openstack/python-octaviaclient
-    vars:
+    vars: &o-grenade-vars
       grenade_devstack_localrc:
         shared:
           DIB_LOCAL_ELEMENTS: openstack-ci-mirrors
@@ -88,10 +88,14 @@
         '/var/log/octavia-amphora.log': 'logs'
 
 - job:
-    name: octavia-grenade-ffu
-    parent: octavia-grenade
-    vars:
-      grenade_from_branch: stable/stein
+    name: octavia-grenade-skip-level
+    description: |
+      Grenade job that skips a release, validating that deployers can skip
+      specific releases as prescribed by our process.
+    parent: grenade-skip-level
+    nodeset: octavia-single-node-ubuntu-focal
+    required-projects: *o-grenade-required-projects
+    vars: *o-grenade-vars
 
 - job:
     name: octavia-v2-dsvm-scenario-jobboard

zuul.d/projects.yaml

@@ -63,7 +63,7 @@
         - octavia-v2-dsvm-tls-barbican:
             irrelevant-files: *irrelevant-files
         - octavia-grenade:
-            irrelevant-files:
+            irrelevant-files: &grenade-irrelevant-files
               - ^.*\.rst$
               - ^api-ref/.*$
               - ^doc/.*$
@@ -73,6 +73,8 @@
               - ^tools/.*$
               - ^(test-|)requirements.txt$
               - ^tox.ini$
+        - octavia-grenade-skip-level:
+            irrelevant-files: *grenade-irrelevant-files
         - octavia-v2-dsvm-tls-barbican-fips:
             irrelevant-files: *irrelevant-files
             voting: false
@@ -116,6 +118,7 @@
         - octavia-v2-dsvm-scenario-non-traffic-ops
         - octavia-v2-dsvm-tls-barbican
         - octavia-grenade
+        - octavia-grenade-skip-level
     periodic:
       jobs:
         - publish-openstack-octavia-amphora-image-focal:
@@ -123,7 +126,6 @@
         - publish-openstack-octavia-amphora-image-centos-9-stream:
             branches: ^(?!stable/.*).*$
         - octavia-amphora-image-build
-        - octavia-grenade-ffu
 # Putting octavia-v2-dsvm-scenario-fips in periodic as centos 8 is too slow
         - octavia-v2-dsvm-scenario-fips:
             voting: false