diff --git a/zuul.d/grenade.yaml b/zuul.d/grenade.yaml index d894f7a7421..bd65f1fd64f 100644 --- a/zuul.d/grenade.yaml +++ b/zuul.d/grenade.yaml @@ -323,11 +323,14 @@ description: | Grenade job that skips a release, validating that deployers can skip specific releases as prescribed by our process. + # See background from gmann: + # https://review.opendev.org/c/openstack/manila/+/859875/1/zuul.d/grenade-jobs.yaml + 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 xena because master is zed. # When master is A, this should become yoga, and so forth. - grenade_from_branch: stable/xena + grenade_from_branch: stable/yoga grenade_localrc: NOVA_ENABLE_UPGRADE_WORKAROUND: True @@ -337,10 +340,13 @@ description: | Grenade job that skips a release, validating that deployers can skip specific releases as prescribed by our process. + # See background from gmann: + # https://review.opendev.org/c/openstack/manila/+/859875/1/zuul.d/grenade-jobs.yaml + 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 xena because master is zed. # When master is A, this should become yoga, and so forth. - grenade_from_branch: stable/xena + grenade_from_branch: stable/yoga grenade_localrc: NOVA_ENABLE_UPGRADE_WORKAROUND: True