From 773359a20bf9e3011bdbc20c9579d9b020ea4f4d Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Thu, 29 Sep 2022 11:01:39 -0500 Subject: [PATCH] Update manila-grenade-skip-level job for new release 2023.1 is SLURP release and can test the upgrade from stable/yoga to 2023.1 by manila-grenade-skip-level job. This commit updates the setting for that job to do so and also add branches variant to avoid running it on non-SLURP (zed) release gate. Change-Id: I0381d89ee7a3c6974ad3b2e1853a4c1ef4b4e77c --- zuul.d/grenade-jobs.yaml | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/zuul.d/grenade-jobs.yaml b/zuul.d/grenade-jobs.yaml index 00049dae9c..7f5a2ecb26 100644 --- a/zuul.d/grenade-jobs.yaml +++ b/zuul.d/grenade-jobs.yaml @@ -97,10 +97,24 @@ 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 wallaby because master is yoga. - # When master is A, this should become yoga, and so forth. - grenade_from_branch: stable/wallaby + # 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 grenade_localrc: - NOVA_ENABLE_UPGRADE_WORKAROUND: True \ No newline at end of file + NOVA_ENABLE_UPGRADE_WORKAROUND: True