From 4f82eded11b6c0db1cd142aff9ad496d9844298d Mon Sep 17 00:00:00 2001 From: Brian Haley Date: Mon, 17 Mar 2025 17:08:15 -0400 Subject: [PATCH] Disable skip-level jobs in check queue During this release (non-SLURP), these jobs are now executed in the "periodic" and "experimental" queues, but not the "check" queue. Change-Id: I7edf681ca7dac78685170d4682c68e28f0e67d9b --- 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 746b94f55a9..5863fc09e1c 100644 --- a/zuul.d/grenade.yaml +++ b/zuul.d/grenade.yaml @@ -403,11 +403,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 Caracal (2024.1) because master is - # Epoxy (2025.1). - # When master is F (2025.2), this should become Dalmatian (2024.2), + # 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), # and so forth. - grenade_from_branch: stable/2024.1 + grenade_from_branch: stable/2024.2 grenade_localrc: NOVA_ENABLE_UPGRADE_WORKAROUND: True grenade_devstack_localrc: @@ -429,11 +429,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 Caracal (2024.1) because master is - # Epoxy (2025.1). - # When master is F (2025.2), this should become Dalmatian (2024.2), + # 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), # and so forth. - grenade_from_branch: stable/2024.1 + grenade_from_branch: stable/2024.2 grenade_localrc: NOVA_ENABLE_UPGRADE_WORKAROUND: True grenade_devstack_localrc: diff --git a/zuul.d/job-templates.yaml b/zuul.d/job-templates.yaml index 1d26e6660b9..ed3755324e2 100644 --- a/zuul.d/job-templates.yaml +++ b/zuul.d/job-templates.yaml @@ -137,15 +137,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