Do not override nodeset for stable scenario jobs
It's partial revert of [1], we manage nodeset for
scenario jobs in job neutron-tempest-plugin-base-nested-switch,
which is already nested-virt-focal. So we don't need to
override in individual jobs as with that these jobs
using non nested virt nodes.
[1] https://review.opendev.org/c/openstack/neutron-tempest-plugin/+/861510
Change-Id: I0c9b276411ec0804b18678532b972365c044ca21
diff --git a/zuul.d/victoria_jobs.yaml b/zuul.d/victoria_jobs.yaml
index d585f9e..a79261d 100644
--- a/zuul.d/victoria_jobs.yaml
+++ b/zuul.d/victoria_jobs.yaml
@@ -134,7 +134,6 @@
- job:
name: neutron-tempest-plugin-scenario-openvswitch-victoria
parent: neutron-tempest-plugin-openvswitch
- nodeset: openstack-single-node-focal
override-checkout: stable/victoria
required-projects: *required-projects-victoria
vars:
@@ -163,7 +162,6 @@
- job:
name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-victoria
parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
- nodeset: openstack-single-node-focal
override-checkout: stable/victoria
required-projects: *required-projects-victoria
vars:
@@ -192,7 +190,6 @@
- job:
name: neutron-tempest-plugin-scenario-linuxbridge-victoria
parent: neutron-tempest-plugin-linuxbridge
- nodeset: openstack-single-node-focal
override-checkout: stable/victoria
required-projects: *required-projects-victoria
vars:
@@ -221,7 +218,6 @@
- job:
name: neutron-tempest-plugin-scenario-ovn-victoria
parent: neutron-tempest-plugin-ovn
- nodeset: openstack-single-node-focal
override-checkout: stable/victoria
required-projects: *required-projects-victoria
vars:
@@ -256,7 +252,6 @@
- job:
name: neutron-tempest-plugin-designate-scenario-victoria
parent: neutron-tempest-plugin-designate-scenario
- nodeset: openstack-single-node-focal
override-checkout: stable/victoria
required-projects:
- openstack/neutron
diff --git a/zuul.d/wallaby_jobs.yaml b/zuul.d/wallaby_jobs.yaml
index 2d73856..6f4648a 100644
--- a/zuul.d/wallaby_jobs.yaml
+++ b/zuul.d/wallaby_jobs.yaml
@@ -98,7 +98,6 @@
- job:
name: neutron-tempest-plugin-scenario-openvswitch-wallaby
parent: neutron-tempest-plugin-openvswitch
- nodeset: openstack-single-node-focal
override-checkout: stable/wallaby
required-projects: *required-projects-wallaby
vars:
@@ -119,7 +118,6 @@
- job:
name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-wallaby
parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
- nodeset: openstack-single-node-focal
override-checkout: stable/wallaby
required-projects: *required-projects-wallaby
vars:
@@ -140,7 +138,6 @@
- job:
name: neutron-tempest-plugin-scenario-linuxbridge-wallaby
parent: neutron-tempest-plugin-linuxbridge
- nodeset: openstack-single-node-focal
override-checkout: stable/wallaby
required-projects: *required-projects-wallaby
vars:
@@ -161,7 +158,6 @@
- job:
name: neutron-tempest-plugin-scenario-ovn-wallaby
parent: neutron-tempest-plugin-ovn
- nodeset: openstack-single-node-focal
override-checkout: stable/wallaby
required-projects: *required-projects-wallaby
vars:
@@ -190,7 +186,6 @@
- job:
name: neutron-tempest-plugin-designate-scenario-wallaby
parent: neutron-tempest-plugin-designate-scenario
- nodeset: openstack-single-node-focal
override-checkout: stable/wallaby
required-projects:
- openstack/neutron
diff --git a/zuul.d/xena_jobs.yaml b/zuul.d/xena_jobs.yaml
index 4afdd77..595b4d8 100644
--- a/zuul.d/xena_jobs.yaml
+++ b/zuul.d/xena_jobs.yaml
@@ -95,7 +95,6 @@
- job:
name: neutron-tempest-plugin-scenario-openvswitch-xena
parent: neutron-tempest-plugin-openvswitch
- nodeset: openstack-single-node-focal
override-checkout: stable/xena
vars:
tempest_test_regex: "\
@@ -115,7 +114,6 @@
- job:
name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-xena
parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
- nodeset: openstack-single-node-focal
override-checkout: stable/xena
vars:
tempest_test_regex: "\
@@ -135,7 +133,6 @@
- job:
name: neutron-tempest-plugin-scenario-linuxbridge-xena
parent: neutron-tempest-plugin-linuxbridge
- nodeset: openstack-single-node-focal
override-checkout: stable/xena
vars:
tempest_test_regex: "\
@@ -155,7 +152,6 @@
- job:
name: neutron-tempest-plugin-scenario-ovn-xena
parent: neutron-tempest-plugin-ovn
- nodeset: openstack-single-node-focal
override-checkout: stable/xena
vars:
tempest_test_regex: "\
@@ -182,7 +178,6 @@
- job:
name: neutron-tempest-plugin-designate-scenario-xena
parent: neutron-tempest-plugin-designate-scenario
- nodeset: openstack-single-node-focal
override-checkout: stable/xena
vars:
network_api_extensions_common: *api_extensions
diff --git a/zuul.d/yoga_jobs.yaml b/zuul.d/yoga_jobs.yaml
index 9eaa4c2..d47fc93 100644
--- a/zuul.d/yoga_jobs.yaml
+++ b/zuul.d/yoga_jobs.yaml
@@ -97,7 +97,6 @@
- job:
name: neutron-tempest-plugin-scenario-openvswitch-yoga
parent: neutron-tempest-plugin-openvswitch
- nodeset: openstack-single-node-focal
override-checkout: stable/yoga
vars:
tempest_test_regex: "\
@@ -117,7 +116,6 @@
- job:
name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-yoga
parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
- nodeset: openstack-single-node-focal
override-checkout: stable/yoga
vars:
tempest_test_regex: "\
@@ -137,7 +135,6 @@
- job:
name: neutron-tempest-plugin-scenario-linuxbridge-yoga
parent: neutron-tempest-plugin-linuxbridge
- nodeset: openstack-single-node-focal
override-checkout: stable/yoga
vars:
tempest_test_regex: "\
@@ -157,7 +154,6 @@
- job:
name: neutron-tempest-plugin-scenario-ovn-yoga
parent: neutron-tempest-plugin-ovn
- nodeset: openstack-single-node-focal
override-checkout: stable/yoga
vars:
tempest_test_regex: "\
@@ -186,7 +182,6 @@
- job:
name: neutron-tempest-plugin-designate-scenario-yoga
parent: neutron-tempest-plugin-designate-scenario
- nodeset: openstack-single-node-focal
override-checkout: stable/yoga
vars:
network_api_extensions_common: *api_extensions
diff --git a/zuul.d/zed_jobs.yaml b/zuul.d/zed_jobs.yaml
index 38299d5..a11c2c8 100644
--- a/zuul.d/zed_jobs.yaml
+++ b/zuul.d/zed_jobs.yaml
@@ -1,7 +1,6 @@
- job:
name: neutron-tempest-plugin-openvswitch-zed
parent: neutron-tempest-plugin-openvswitch
- nodeset: openstack-single-node-focal
override-checkout: stable/zed
vars:
network_api_extensions_openvswitch:
@@ -107,7 +106,6 @@
- job:
name: neutron-tempest-plugin-openvswitch-iptables_hybrid-zed
parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
- nodeset: openstack-single-node-focal
override-checkout: stable/zed
vars:
network_api_extensions_openvswitch:
@@ -138,7 +136,6 @@
- job:
name: neutron-tempest-plugin-linuxbridge-zed
parent: neutron-tempest-plugin-linuxbridge
- nodeset: openstack-single-node-focal
override-checkout: stable/zed
vars:
network_api_extensions_linuxbridge:
@@ -165,7 +162,6 @@
- job:
name: neutron-tempest-plugin-ovn-zed
parent: neutron-tempest-plugin-ovn
- nodeset: openstack-single-node-focal
override-checkout: stable/zed
vars:
tempest_test_regex: "\
@@ -197,7 +193,6 @@
- job:
name: neutron-tempest-plugin-designate-scenario-zed
parent: neutron-tempest-plugin-designate-scenario
- nodeset: openstack-single-node-focal
override-checkout: stable/zed
vars:
network_api_extensions_common: *api_extensions