From ec1979bdcf7b6547cf47b96ae10097a51ac6bd68 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Fri, 31 Mar 2023 10:20:17 -0500
Subject: [PATCH] Move skip level job to manila-grenade-skip-level-always

This is non SLURP release and we need to update the setting
for skip level grenade job. As per new plan, grenade upgrade
testing, we can prepare a *skip-level-always job which always
do upgrade N-2 to N release and
- In SLURP release we need to run it as voting
- In non SLURP relerase we have choice to run as voting
or non voting/periodic etc

Change-Id: I5474c704d514d2c2b6db0ce2bd429d3b7f9764af
---
 zuul.d/grenade-jobs.yaml | 23 ++++-------------------
 zuul.d/project.yaml      |  5 ++++-
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/zuul.d/grenade-jobs.yaml b/zuul.d/grenade-jobs.yaml
index 7f5a2ecb26..9a4d38420e 100644
--- a/zuul.d/grenade-jobs.yaml
+++ b/zuul.d/grenade-jobs.yaml
@@ -92,29 +92,14 @@
       tox_envlist: all
 
 - job:
-    name: manila-grenade-skip-level
+    name: manila-grenade-skip-level-always
     description: |
       Grenade job that skips a release, validating that deployers can skip
       specific releases as prescribed by our process.
     parent: manila-grenade
-    # NOTE(gmann): This job is started and meant to be run from Yoga release.
-    # This job is meant to validate the SLURP to SLURP release
-    # upgrade so supposed to run on SLURP release gate only. To make sure
-    # that, when the current master is not SLURP release, below branch variant will
-    # stop running it on not SLURP release master. And once new SLURP release start
-    # (means the current master is SLURP release), we need to remove the 'master'
-    # from the below branch variant condition so that it again start running on
-    # SLURP release master gate.
-    # Along with grenade gate, this job runs on many other projects gate
-    # also and in this job definition, we control for everyone to run on SLURP
-    # release only.
-    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 stable/yoga because current master is 2023.1
-      # (which is N+2 release from yoga so skipping zed release and testing the upgrade
-      # from stable/yoga -> 2023.1). When master is 2023.3, this should become 2023.1,
-      # and so forth.
-      grenade_from_branch: stable/yoga
+      # Move this forward when a new release cycle start. grenade_from_branch
+      # should be always N-2 from master.
+      grenade_from_branch: stable/zed
       grenade_localrc:
         NOVA_ENABLE_UPGRADE_WORKAROUND: True
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 8e4d679150..213175ec3a 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -28,7 +28,10 @@
             voting: false
         - manila-grenade:
             voting: false
-        - manila-grenade-skip-level:
+        # NOTE: this job needs to be voting in SLURP release and option to
+        # voting in non SLURP. But keeping it voting in non SLURP also will
+        # help us to know any upgrade break in advance.
+        - manila-grenade-skip-level-always:
             voting: false
         - manila-rally-no-ss:
             voting: false