From caae7cc6ec20261d416f49d2b0fa0e819af3adec Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Thu, 2 Nov 2023 14:54:31 -0700 Subject: [PATCH] CI: Update job config for 2023.2 being a stable branch Increment the jobs, in other words: * Add jobs for 2023.2 * Mark Zed jobs non-voting * Remove older jobs from the tempest plugin's normal execution as they were non-voting previously. Change-Id: I27d852063a74938992c5cd37e45bfecf31aadd41 --- zuul.d/project.yaml | 47 ++++++++++++++++++----------------------- zuul.d/stable-jobs.yaml | 45 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 27 deletions(-) diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index a6e8c5ac..c261a70e 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -7,72 +7,65 @@ jobs: # NOTE(dtantsur): keep N-3 and older non-voting for these jobs. - ironic-standalone + - ironic-standalone-2023.2 - ironic-standalone-2023.1 - - ironic-standalone-zed - - ironic-standalone-yoga: - voting: false - - ironic-standalone-xena: + - ironic-standalone-zed: voting: false - ironic-tempest-functional-python3 + - ironic-tempest-functional-python3-2023.2 - ironic-tempest-functional-python3-2023.1 - - ironic-tempest-functional-python3-zed - - ironic-tempest-functional-python3-yoga: - voting: false - - ironic-tempest-functional-python3-xena: + - ironic-tempest-functional-python3-zed: voting: false - ironic-tempest-functional-rbac-scope-enforced + - ironic-tempest-functional-rbac-scope-enforced-2023.2 # Enable these *once* we have the policy fix backported # for making own node changes. # - ironic-tempest-functional-rbac-scope-enforced-2023.1 # - ironic-tempest-functional-rbac-scope-enforced-zed - ironic-inspector-tempest + - ironic-inspector-tempest-2023.2 - ironic-inspector-tempest-2023.1 - - ironic-inspector-tempest-zed - - ironic-inspector-tempest-yoga: - voting: false - - ironic-inspector-tempest-xena: + - ironic-inspector-tempest-zed: voting: false - ironic-standalone-anaconda + - ironic-standalone-anaconda-2023.2 - ironic-standalone-anaconda-2023.1 - ironic-standalone-redfish + - ironic-standalone-redfish-2023.2 - ironic-standalone-redfish-2023.1 - - ironic-standalone-redfish-zed - - ironic-standalone-redfish-yoga: - voting: false - - ironic-standalone-redfish-xena: + - ironic-standalone-redfish-zed: voting: false # NOTE(dtantsur): these jobs cover rarely changed tests and are quite # unstable, so keep them non-voting. - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode: voting: false + - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-2023.2: + voting: false - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-2023.1: voting: false - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-zed: voting: false - - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-yoga: - voting: false - - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-xena: - voting: false - ironic-inspector-tempest-discovery + - ironic-inspector-tempest-discovery-2023.2 - ironic-inspector-tempest-discovery-2023.1 - - ironic-inspector-tempest-discovery-zed - - ironic-inspector-tempest-discovery-yoga: - voting: false - - ironic-inspector-tempest-discovery-xena: + - ironic-inspector-tempest-discovery-zed: voting: false gate: jobs: - ironic-standalone + - ironic-standalone-2023.2 - ironic-standalone-2023.1 - - ironic-standalone-zed - ironic-tempest-functional-python3 + - ironic-tempest-functional-python3-2023.2 - ironic-tempest-functional-python3-2023.1 - - ironic-tempest-functional-python3-zed + - ironic-tempest-functional-rbac-scope-enforced-2023.2 - ironic-tempest-functional-rbac-scope-enforced - ironic-inspector-tempest + - ironic-inspector-tempest-2023.2 - ironic-inspector-tempest-2023.1 - - ironic-inspector-tempest-zed - ironic-inspector-tempest-rbac-scope-enforced + - ironic-inspector-tempest-rbac-scope-enforced-2023.2 - ironic-standalone-redfish + - ironic-standalone-redfish-2023.2 - ironic-standalone-redfish-2023.1 - ironic-inspector-tempest-discovery diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml index fed604be..bbbe8c6b 100644 --- a/zuul.d/stable-jobs.yaml +++ b/zuul.d/stable-jobs.yaml @@ -1,3 +1,8 @@ +- job: + name: ironic-standalone-2023.2 + parent: ironic-standalone + override-checkout: stable/2023.2 + - job: name: ironic-standalone-2023.1 parent: ironic-standalone @@ -41,6 +46,11 @@ devstack_localrc: USE_PYTHON3: True +- job: + name: ironic-standalone-redfish-2023.2 + parent: ironic-standalone + override-checkout: stable/2023.2 + - job: name: ironic-standalone-redfish-2023.1 parent: ironic-standalone @@ -88,11 +98,21 @@ devstack_localrc: USE_PYTHON3: True +- job: + name: ironic-standalone-anaconda-2023.2 + parent: ironic-standalone-anaconda + override-checkout: stable/2023.2 + - job: name: ironic-standalone-anaconda-2023.1 parent: ironic-standalone-anaconda override-checkout: stable/2023.1 +- job: + name: ironic-tempest-functional-python3-2023.2 + parent: ironic-tempest-functional-python3 + override-checkout: stable/2023.2 + - job: name: ironic-tempest-functional-python3-2023.1 parent: ironic-tempest-functional-python3 @@ -133,6 +153,11 @@ parent: ironic-tempest-functional-python3 override-checkout: stable/train +- job: + name: ironic-tempest-functional-rbac-scope-enforced-2023.2 + parent: ironic-tempest-functional-rbac-scope-enforced + override-checkout: stable/2023.2 + - job: name: ironic-tempest-functional-rbac-scope-enforced-2023.1 parent: ironic-tempest-functional-rbac-scope-enforced @@ -148,6 +173,11 @@ parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode override-checkout: stable/zed +- job: + name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-2023.2 + parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode + override-checkout: stable/2023.2 + - job: name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-2023.1 parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode @@ -186,6 +216,11 @@ devstack_localrc: USE_PYTHON3: True +- job: + name: ironic-inspector-tempest-2023.2 + parent: ironic-inspector-tempest + override-checkout: stable/2023.2 + - job: name: ironic-inspector-tempest-2023.1 parent: ironic-inspector-tempest @@ -238,6 +273,11 @@ EBTABLES_RACE_FIX: True USE_PYTHON3: True +- job: + name: ironic-inspector-tempest-rbac-scope-enforced-2023.2 + parent: ironic-inspector-tempest-rbac-scope-enforced + override-checkout: stable/2023.2 + - job: name: ironic-inspector-tempest-rbac-scope-enforced-2023.1 parent: ironic-inspector-tempest-rbac-scope-enforced @@ -248,6 +288,11 @@ parent: ironic-inspector-tempest-rbac-scope-enforced override-checkout: stable/zed +- job: + name: ironic-inspector-tempest-discovery-2023.2 + parent: ironic-inspector-tempest-discovery + override-checkout: stable/2023.2 + - job: name: ironic-inspector-tempest-discovery-2023.1 parent: ironic-inspector-tempest-discovery