From 1a9907756e8b5bd344fd80d64d77fc2847d72be2 Mon Sep 17 00:00:00 2001 From: Brian Haley Date: Fri, 15 Sep 2023 16:19:37 -0400 Subject: [PATCH] Bump skip-level lower version to stable/2023.1 During the 2024.1 release, the lower version of grenade "skip-level" jobs should be stable/2023.1. During this release (SLURP), these jobs are now executed in the "check" queue as voting. Change-Id: I72ddd7657d219734bf44af38fc2f75e29bbc9547 --- zuul.d/grenade.yaml | 16 ++++++++++------ zuul.d/job-templates.yaml | 28 +++++++++++++--------------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/zuul.d/grenade.yaml b/zuul.d/grenade.yaml index 956c21b9f37..b57fff27010 100644 --- a/zuul.d/grenade.yaml +++ b/zuul.d/grenade.yaml @@ -381,9 +381,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 Zed because master is Bobcat (2023.2). - # When master is C, this should become Antelope (2023.1), and so forth. - grenade_from_branch: stable/zed + # target release. Right now, this is Antelope (2023.1) because master is + # Caracal (2024.1). + # When master is E (2025.1), this should become Caracal (2024.1), + # and so forth. + grenade_from_branch: stable/2023.1 grenade_localrc: NOVA_ENABLE_UPGRADE_WORKAROUND: True @@ -395,8 +397,10 @@ 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 Zed because master is Bobcat (2023.2). - # When master is C, this should become Antelope (2023.1), and so forth. - grenade_from_branch: stable/zed + # target release. Right now, this is Antelope (2023.1) because master is + # Caracal (2024.1). + # When master is E (2025.1), this should become Caracal (2024.1), + # and so forth. + grenade_from_branch: stable/2023.1 grenade_localrc: NOVA_ENABLE_UPGRADE_WORKAROUND: True diff --git a/zuul.d/job-templates.yaml b/zuul.d/job-templates.yaml index 6263c0c63f7..d8d07145c1c 100644 --- a/zuul.d/job-templates.yaml +++ b/zuul.d/job-templates.yaml @@ -130,19 +130,17 @@ - project-template: name: neutron-skip-level-jobs - # NOTE(ralonsoh): during Bobcat (non SLURP release), these - # jobs are not executed in the "check" queue. - #check: + # During a SLURP release, these jobs are executed in the check queue, + # otherwise periodic/experimental. SLURP releases are 2024.1, 2025.1, etc. + check: + jobs: + - neutron-ovs-grenade-multinode-skip-level + - neutron-ovn-grenade-multinode-skip-level + #periodic: # jobs: - # - neutron-ovs-grenade-multinode-skip-level: - # voting: false - # - neutron-ovn-grenade-multinode-skip-level: - # voting: false - 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 + # - 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