CI: scale back the number of inspector and scope enforced jobs
* Remove specific scope enforced jobs from master
With recent oslo.policy changes, we no longer need to have specific
scope enforced test jobs. As such, removing them from master branch
testing.
* Leave only the master ironic-inspector job voting
Inspector is deprecated and does not receive many changes. Leave one
voting jobs and 2 non-voting: for 2024.1 and the discovery one.
* Remove inspector scope enforced jobs from the gate
They are not in the check pipeline and must not be in the gate.
Same logic as above applies to these jobs.
* Copy anaconda jobs into the gate pipeline
Voting check jobs must be in the gate, so fixing the descrepancy.
* Purge definitions of unused jobs.
Co-Authored-By: Dmitry Tantsur <dtantsur@protonmail.com>
Change-Id: I17e1604b036e98ee2e8ce6424bfeb2b0bef8e471
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 11eb7c0..8e7dd20 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -15,17 +15,11 @@
- ironic-tempest-functional-python3-2024.1
- ironic-tempest-functional-python3-2023.2:
voting: false
- - ironic-tempest-functional-rbac-scope-enforced
- ironic-tempest-functional-rbac-scope-enforced-2024.1
- 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-inspector-tempest
- - ironic-inspector-tempest-2024.1
- - ironic-inspector-tempest-2023.2
- - ironic-inspector-tempest-2023.1:
- voting: false
- ironic-standalone-anaconda
- ironic-standalone-anaconda-2024.1
- ironic-standalone-anaconda-2023.2
@@ -36,6 +30,11 @@
- ironic-standalone-redfish-2023.2
- ironic-standalone-redfish-2023.1:
voting: false
+ # NOTE(dtantsur): inspector is deprecated and rarely sees any changes,
+ # no point in running many jobs
+ - ironic-inspector-tempest
+ - ironic-inspector-tempest-2024.1:
+ voting: false
# NOTE(dtantsur): these jobs cover rarely changed tests and are quite
# unstable, so keep them non-voting.
# NOTE(TheJulia): Except this first one so we can validate fixes to
@@ -47,10 +46,7 @@
voting: false
- ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-2023.1:
voting: false
- - ironic-inspector-tempest-discovery
- - ironic-inspector-tempest-discovery-2024.1
- - ironic-inspector-tempest-discovery-2023.2
- - ironic-inspector-tempest-discovery-2023.1:
+ - ironic-inspector-tempest-discovery:
voting: false
gate:
jobs:
@@ -62,14 +58,10 @@
- ironic-tempest-functional-python3-2023.2
- ironic-tempest-functional-rbac-scope-enforced-2024.1
- ironic-tempest-functional-rbac-scope-enforced-2023.2
- - ironic-tempest-functional-rbac-scope-enforced
- - ironic-inspector-tempest
- - ironic-inspector-tempest-2024.1
- - ironic-inspector-tempest-2023.2
- - ironic-inspector-tempest-rbac-scope-enforced
- - ironic-inspector-tempest-rbac-scope-enforced-2024.1
- - ironic-inspector-tempest-rbac-scope-enforced-2023.2
+ - ironic-standalone-anaconda
+ - ironic-standalone-anaconda-2024.1
+ - ironic-standalone-anaconda-2023.2
- ironic-standalone-redfish
- ironic-standalone-redfish-2024.1
- ironic-standalone-redfish-2023.2
- - ironic-inspector-tempest-discovery
+ - ironic-inspector-tempest
diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml
index 3643bf4..1104540 100644
--- a/zuul.d/stable-jobs.yaml
+++ b/zuul.d/stable-jobs.yaml
@@ -14,44 +14,6 @@
override-checkout: stable/2023.1
- job:
- name: ironic-standalone-zed
- parent: ironic-standalone
- override-checkout: stable/zed
-
-- job:
- name: ironic-standalone-yoga
- parent: ironic-standalone
- override-checkout: stable/yoga
-
-- job:
- name: ironic-standalone-xena
- parent: ironic-standalone
- override-checkout: stable/xena
-
-- job:
- name: ironic-standalone-wallaby
- parent: ironic-standalone
- override-checkout: stable/wallaby
-
-- job:
- name: ironic-standalone-victoria
- parent: ironic-standalone
- override-checkout: stable/victoria
-
-- job:
- name: ironic-standalone-ussuri
- parent: ironic-standalone
- override-checkout: stable/ussuri
-
-- job:
- name: ironic-standalone-train
- parent: ironic-standalone
- override-checkout: stable/train
- vars:
- devstack_localrc:
- USE_PYTHON3: True
-
-- job:
name: ironic-standalone-redfish-2024.1
parent: ironic-standalone
override-checkout: stable/2024.1
@@ -67,48 +29,6 @@
override-checkout: stable/2023.1
- job:
- name: ironic-standalone-redfish-zed
- parent: ironic-standalone
- override-checkout: stable/zed
-
-- job:
- name: ironic-standalone-redfish-yoga
- parent: ironic-standalone-redfish
- nodeset: openstack-single-node-focal
- override-checkout: stable/yoga
-
-- job:
- name: ironic-standalone-redfish-xena
- parent: ironic-standalone-redfish
- nodeset: openstack-single-node-focal
- override-checkout: stable/xena
-
-- job:
- name: ironic-standalone-redfish-wallaby
- parent: ironic-standalone-redfish
- nodeset: openstack-single-node-focal
- override-checkout: stable/wallaby
-
-- job:
- name: ironic-standalone-redfish-victoria
- parent: ironic-standalone-redfish
- nodeset: openstack-single-node-focal
- override-checkout: stable/victoria
-
-- job:
- name: ironic-standalone-redfish-ussuri
- parent: ironic-standalone-redfish
- override-checkout: stable/ussuri
-
-- job:
- name: ironic-standalone-redfish-train
- parent: ironic-standalone-redfish
- override-checkout: stable/train
- vars:
- devstack_localrc:
- USE_PYTHON3: True
-
-- job:
name: ironic-standalone-anaconda-2024.1
parent: ironic-standalone-anaconda
override-checkout: stable/2024.1
@@ -139,41 +59,6 @@
override-checkout: stable/2023.1
- job:
- name: ironic-tempest-functional-python3-zed
- parent: ironic-tempest-functional-python3
- override-checkout: stable/zed
-
-- job:
- name: ironic-tempest-functional-python3-yoga
- parent: ironic-tempest-functional-python3
- override-checkout: stable/yoga
-
-- job:
- name: ironic-tempest-functional-python3-xena
- parent: ironic-tempest-functional-python3
- override-checkout: stable/xena
-
-- job:
- name: ironic-tempest-functional-python3-wallaby
- parent: ironic-tempest-functional-python3
- override-checkout: stable/wallaby
-
-- job:
- name: ironic-tempest-functional-python3-victoria
- parent: ironic-tempest-functional-python3
- override-checkout: stable/victoria
-
-- job:
- name: ironic-tempest-functional-python3-ussuri
- parent: ironic-tempest-functional-python3
- override-checkout: stable/ussuri
-
-- job:
- name: ironic-tempest-functional-python3-train
- parent: ironic-tempest-functional-python3
- override-checkout: stable/train
-
-- job:
name: ironic-tempest-functional-rbac-scope-enforced-2024.1
parent: ironic-tempest-functional-rbac-scope-enforced
override-checkout: stable/2024.1
@@ -189,16 +74,6 @@
override-checkout: stable/2023.1
- job:
- name: ironic-tempest-functional-rbac-scope-enforced-zed
- parent: ironic-tempest-functional-rbac-scope-enforced
- override-checkout: stable/zed
-
-- job:
- name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-zed
- parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
- override-checkout: stable/zed
-
-- job:
name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-2024.1
parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
override-checkout: stable/2024.1
@@ -214,169 +89,6 @@
override-checkout: stable/2023.1
- job:
- name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-yoga
- parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
- override-checkout: stable/yoga
-
-- job:
- name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-xena
- parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
- override-checkout: stable/xena
-
-- job:
- name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-wallaby
- parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
- override-checkout: stable/wallaby
-
-- job:
- name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-victoria
- parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
- override-checkout: stable/victoria
-
-- job:
- name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-ussuri
- parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
- override-checkout: stable/ussuri
-
-- job:
- name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-train
- parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
- override-checkout: stable/train
- vars:
- devstack_localrc:
- USE_PYTHON3: True
-
-- job:
name: ironic-inspector-tempest-2024.1
parent: ironic-inspector-tempest
override-checkout: stable/2024.1
-
-- 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
- override-checkout: stable/2023.1
-
-- job:
- name: ironic-inspector-tempest-zed
- parent: ironic-inspector-tempest
- override-checkout: stable/zed
-
-- job:
- name: ironic-inspector-tempest-yoga
- parent: ironic-inspector-tempest
- override-checkout: stable/yoga
-
-- job:
- name: ironic-inspector-tempest-xena
- parent: ironic-inspector-tempest
- override-checkout: stable/xena
-
-- job:
- name: ironic-inspector-tempest-wallaby
- parent: ironic-inspector-tempest
- override-checkout: stable/wallaby
-
-- job:
- name: ironic-inspector-tempest-victoria
- parent: ironic-inspector-tempest
- override-checkout: stable/victoria
- vars:
- devstack_localrc:
- FIXED_NETWORK_SIZE: 4096
-
-- job:
- name: ironic-inspector-tempest-ussuri
- parent: ironic-inspector-tempest
- override-checkout: stable/ussuri
- vars:
- devstack_localrc:
- FIXED_NETWORK_SIZE: 4096
- EBTABLES_RACE_FIX: True
-
-- job:
- name: ironic-inspector-tempest-train
- parent: ironic-inspector-tempest
- override-checkout: stable/train
- vars:
- devstack_localrc:
- FIXED_NETWORK_SIZE: 4096
- EBTABLES_RACE_FIX: True
- USE_PYTHON3: True
-
-- job:
- name: ironic-inspector-tempest-rbac-scope-enforced-2024.1
- parent: ironic-inspector-tempest-rbac-scope-enforced
- override-checkout: stable/2024.1
-
-- 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
- override-checkout: stable/2023.1
-
-- job:
- name: ironic-inspector-tempest-rbac-scope-enforced-zed
- parent: ironic-inspector-tempest-rbac-scope-enforced
- override-checkout: stable/zed
-
-- job:
- name: ironic-inspector-tempest-discovery-2024.1
- parent: ironic-inspector-tempest-discovery
- override-checkout: stable/2024.1
-
-- 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
- override-checkout: stable/2023.1
-
-- job:
- name: ironic-inspector-tempest-discovery-zed
- parent: ironic-inspector-tempest-discovery
- override-checkout: stable/zed
-
-- job:
- name: ironic-inspector-tempest-discovery-yoga
- parent: ironic-inspector-tempest-discovery
- override-checkout: stable/yoga
-
-- job:
- name: ironic-inspector-tempest-discovery-xena
- parent: ironic-inspector-tempest-discovery
- override-checkout: stable/xena
-
-- job:
- name: ironic-inspector-tempest-discovery-wallaby
- parent: ironic-inspector-tempest-discovery
- override-checkout: stable/wallaby
-
-- job:
- name: ironic-inspector-tempest-discovery-victoria
- parent: ironic-inspector-tempest-discovery
- override-checkout: stable/victoria
-
-- job:
- name: ironic-inspector-tempest-discovery-ussuri
- parent: ironic-inspector-tempest-discovery
- override-checkout: stable/ussuri
-
-- job:
- name: ironic-inspector-tempest-discovery-train
- parent: ironic-inspector-tempest-discovery
- override-checkout: stable/train
- vars:
- devstack_localrc:
- USE_PYTHON3: True