From fa40f3b75152740b248d3f229e4cc196f6775b99 Mon Sep 17 00:00:00 2001 From: Brian Haley Date: Wed, 24 Sep 2025 22:25:48 -0400 Subject: [PATCH] Bump skip-level lower version to stable/2025.1 During the 2026.1 release, the lower version of grenade "skip-level" jobs should be stable/2025.1. During this release (SLURP), these jobs are now executed in the "check" queue as voting. Change-Id: I00f9f9e5dc91efbcfc077444b8c441274cc6d333 Signed-off-by: Brian Haley --- zuul.d/grenade.yaml | 16 ++++++++-------- zuul.d/job-templates.yaml | 18 +++++++++--------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/zuul.d/grenade.yaml b/zuul.d/grenade.yaml index 8bf304b30e9..8af4cbd6f0e 100644 --- a/zuul.d/grenade.yaml +++ b/zuul.d/grenade.yaml @@ -409,11 +409,11 @@ specific releases as prescribed by our process. vars: # Move this forward when master changes to a new skip-level-allowed - # target release. Right now, this is Dalmatian (2024.2) because master is - # Flamingo (2025.2). - # When master is G (2026.1), this should become Epoxy (2025.1), + # target release. Right now, this is Epoxy (2025.1) because master is + # Gazpacho (2026.1). + # When master is H (2026.2), this should become Flamingo (2025.2), # and so forth. - grenade_from_branch: stable/2024.2 + grenade_from_branch: stable/2025.1 grenade_localrc: NOVA_ENABLE_UPGRADE_WORKAROUND: True @@ -425,11 +425,11 @@ specific releases as prescribed by our process. vars: # Move this forward when master changes to a new skip-level-allowed - # target release. Right now, this is Dalmatian (2024.2) because master is - # Flamingo (2025.2). - # When master is G (2026.1), this should become Epoxy (2025.1), + # target release. Right now, this is Epoxy (2025.1) because master is + # Gazpacho (2026.1). + # When master is H (2026.2), this should become Flamingo (2025.2), # and so forth. - grenade_from_branch: stable/2024.2 + grenade_from_branch: stable/2025.1 grenade_localrc: NOVA_ENABLE_UPGRADE_WORKAROUND: True diff --git a/zuul.d/job-templates.yaml b/zuul.d/job-templates.yaml index d232ea7f624..0fabc2f1eb9 100644 --- a/zuul.d/job-templates.yaml +++ b/zuul.d/job-templates.yaml @@ -138,15 +138,15 @@ name: neutron-skip-level-jobs # During a SLURP release, these jobs are executed in the check queue, # otherwise periodic/experimental. SLURP releases are 2024.1, 2025.1, etc. - #check: + check: + jobs: + - neutron-ovs-grenade-multinode-skip-level + - neutron-ovn-grenade-multinode-skip-level + #periodic: + # jobs: + # - neutron-ovs-grenade-multinode-skip-level + # - neutron-ovn-grenade-multinode-skip-level + #experimental: # jobs: # - neutron-ovs-grenade-multinode-skip-level # - neutron-ovn-grenade-multinode-skip-level - periodic: - jobs: - - neutron-ovs-grenade-multinode-skip-level - - neutron-ovn-grenade-multinode-skip-level - experimental: - jobs: - - neutron-ovs-grenade-multinode-skip-level - - neutron-ovn-grenade-multinode-skip-level