From 17fd1212e37b7af08438c29e0e10b26dc22d14b0 Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Fri, 21 Mar 2025 11:27:06 -0700 Subject: [PATCH] Update the master grenade setting Update master grenade jobs to upgrade testing - grenade job to test 2025.1(N-1) to master(N) upgrade - grenade skip level job to test 2024.2(N-2) to master(N) upgrade Also, heat job is failing 100%, so making it non voting to merge this change. Depends-On: https://review.opendev.org/c/openstack/devstack/+/945237 Change-Id: I5e0110a61a5a5635530813cb76fb0c86f3ef661c --- .zuul.yaml | 8 +++++--- roles/configure-grenade-branches/defaults/main.yaml | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 4e38f120..ff75de5a 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -5,7 +5,9 @@ jobs: - grenade - grenade-multinode - - grenade-heat-multinode + # TODO(gmann) heat job is failing 100%, make it voting again once it is green. + - grenade-heat-multinode: + voting: false - octavia-grenade - ironic-grenade: voting: false @@ -14,7 +16,7 @@ jobs: - grenade - grenade-multinode - - grenade-heat-multinode + # - grenade-heat-multinode - octavia-grenade - grenade-skip-level-always experimental: @@ -393,6 +395,6 @@ vars: # For the base "always" job, this should always be the N-2 release # for projects that want to assert N-2 upgradability on all releases. - grenade_from_branch: stable/2024.1 + grenade_from_branch: stable/2024.2 grenade_localrc: NOVA_ENABLE_UPGRADE_WORKAROUND: True diff --git a/roles/configure-grenade-branches/defaults/main.yaml b/roles/configure-grenade-branches/defaults/main.yaml index fbacf4fb..394e862d 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/2024.2 +grenade_from_branch: stable/2025.1 grenade_to_branch: master