Update grenade setting on current master

grenade is branched for stable/2023.2, so updating
the current master default setting for:
- Update grenade testing from stable/2023.2 to master.
- Update grenade-skip-level and grenade-skip-level-always
  jobs to upgrade from stable/2023.1 -> master

Depends-On: https://review.opendev.org/c/openstack/grenade/+/897381
Change-Id: I1dbea0caad676d6be7a4a58495a76a351e3c41e5

.zuul.yaml

@@ -11,14 +11,14 @@
         # - octavia-grenade
         - ironic-grenade:
             voting: false
-        - grenade-skip-level:
-            voting: false
+        - grenade-skip-level
     gate:
       jobs:
         - grenade
         - grenade-multinode
         - grenade-heat-multinode
         # - octavia-grenade
+        - grenade-skip-level
     experimental:
       jobs:
         - grenade-postgresql
@@ -389,7 +389,7 @@
       # For the base "always" job, this should always be the N-2 release from
       # current master for projects that want to assert N-2 upgradability
       # on all releases.
-      grenade_from_branch: stable/zed
+      grenade_from_branch: stable/2023.1
       grenade_localrc:
         NOVA_ENABLE_UPGRADE_WORKAROUND: True
 
@@ -398,29 +398,18 @@
     description: |
       Grenade job that skips a release, validating that deployers can skip
       specific releases as prescribed by our process.
-    nodeset: openstack-single-node-focal
+    nodeset: openstack-single-node-jammy
     parent: grenade-skip-level-always
-      # 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.
-      # 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.
+      # NOTE(gmann): This job is meant to validate the SLURP to SLURP release
+      # upgrade so it supposed to run on SLURP release gate only. If current master
+      # is not SLURP release,we can remove the job definition from master branch.
+      # SLURP release upgrade jobs are defined in their respective stable branch.
+      # If you would like to run N-2 -> N upgrade testing on non SLURP releases
+      # then use grenade-skip-level-always job.
+      # 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.
     vars:
-      grenade_from_branch: stable/yoga
-    # 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.
+      grenade_from_branch: stable/2023.1
     branches:
-      regex: ^master|stable/(train|ussuri|victoria|wallaby|xena|zed)$
-      negate: true
+      - master

roles/configure-grenade-branches/defaults/main.yaml

@@ -1,3 +1,3 @@
 ---
-grenade_from_branch: stable/2023.1
+grenade_from_branch: stable/2023.2
 grenade_to_branch: master