From 1ce132fdafd0853d80e116f2a720a14c4f08b06a Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Mon, 20 Mar 2023 13:39:52 -0500
Subject: [PATCH] Update grenade setting on current master

grenade is branched for stable/2023.1, so updating
the current master default setting for:
- Update grenade testing from stable/2023.1 to master.
- Update grenade-skip-level job not to run for current non SLURP master
release

octavia-grenade job is broken due to diskimage-builder so to unblock
grenade gate, stop running it and we can run it once DIB fix is merged
and released
- https://review.opendev.org/c/openstack/diskimage-builder/+/878089

Change-Id: I400c7f386e5b900774039223c9199508229494a2
---
 .zuul.yaml                                        | 15 ++++++++++-----
 .../configure-grenade-branches/defaults/main.yaml |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 937dd797..34119461 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -6,7 +6,9 @@
         - grenade
         - grenade-multinode
         - grenade-heat-multinode
-        - octavia-grenade
+        # TODO (gmann): Run octavia-grenade job once DIB fix is merged and released
+        # https://review.opendev.org/c/openstack/diskimage-builder/+/878089
+        # - octavia-grenade
         - ironic-grenade:
             voting: false
         - grenade-skip-level:
@@ -16,7 +18,7 @@
         - grenade
         - grenade-multinode
         - grenade-heat-multinode
-        - octavia-grenade
+        # - octavia-grenade
     experimental:
       jobs:
         - grenade-postgresql
@@ -158,7 +160,7 @@
       Default grenade job
 
       Usually grenade jobs should inherit from this job.
-    nodeset: openstack-single-node-focal
+    nodeset: openstack-single-node-jammy
     required-projects:
       # NOTE(andreaf) The devstack and grenade roles take care of setting up
       # repos on the right branch for this job.
@@ -369,7 +371,7 @@
     description: |
       Basic multinode grenade job
     parent: grenade
-    nodeset: openstack-two-node-focal
+    nodeset: openstack-two-node-jammy
     pre-run: playbooks/multinode-pre.yaml
 
 - job:
@@ -399,6 +401,9 @@
       # (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.
+      # Current master 2023.2 is non SLURP release to this job will be skiped to run
+      # on current master. If you would like to run N-2 -> N upgrade testing on current
+      # non SLURP master then use grenade-skip-level-always job.
     vars:
       grenade_from_branch: stable/yoga
     # NOTE(gmann): This job is started and meant to be run from Yoga release.
@@ -412,4 +417,4 @@
     # 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)).*$
+    branches: ^(?!master|stable/(pike|queens|rocky|stein|train|ussuri|victoria|wallaby|xena|zed)).*$
diff --git a/roles/configure-grenade-branches/defaults/main.yaml b/roles/configure-grenade-branches/defaults/main.yaml
index 21a4feda..fb85d1ac 100644
--- a/roles/configure-grenade-branches/defaults/main.yaml
+++ b/roles/configure-grenade-branches/defaults/main.yaml
@@ -1,3 +1,3 @@
 ---
-grenade_from_branch: stable/zed
+grenade_from_branch: stable/2023.1
 grenade_to_branch: master