diff --git a/.zuul.yaml b/.zuul.yaml index 2c96f76c..dc1caec9 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -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,7 +398,7 @@ 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 @@ -409,7 +409,7 @@ # 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 + grenade_from_branch: stable/2023.1 # 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 @@ -422,5 +422,5 @@ # also and in this job definition, we control for everyone to run on SLURP # release only. branches: - regex: ^master|stable/(train|ussuri|victoria|wallaby|xena|zed)$ + regex: ^stable/(train|ussuri|victoria|wallaby|xena|zed|2023.2)$ negate: true diff --git a/roles/configure-grenade-branches/defaults/main.yaml b/roles/configure-grenade-branches/defaults/main.yaml index fb85d1ac..410e7d32 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/2023.1 +grenade_from_branch: stable/2023.2 grenade_to_branch: master