Restructure move to nested virt nodes
With [1] scenario jobs were moved to nested virt
nodes. But that also modified jobs for EM releases
like queens/rocky/stein/train/ussuri as all jobs have
common parent. And since these jobs override the
nodeset can fail with 'kvm' libvirt_type when
not using nested-virt nodes.
So proposing to create two variants of nested-switch
job based on Extended Maintenance or non Extended
maintenance releases. As only few providers provide
the nested virt nodes utilizing these nodes only
for non EM releases would be better as those
only have maximum number of patches.
Also adding zuul.d/base-nested-switch.yaml to irrelevant
files to allow easier switch to non nested virt nodes
when there is issue with all the providers providing
these nodes or when we see issues with nested-virt
nodes.
[1] https://review.opendev.org/c/openstack/neutron-tempest-plugin/+/821067
Change-Id: Ibee6b0bc7fc219f3d1e43795fa42b56512ee3bb8
diff --git a/zuul.d/base-nested-switch.yaml b/zuul.d/base-nested-switch.yaml
new file mode 100644
index 0000000..69e841f
--- /dev/null
+++ b/zuul.d/base-nested-switch.yaml
@@ -0,0 +1,32 @@
+- nodeset:
+ name: neutron-nested-virt-ubuntu-focal
+ nodes:
+ - name: controller
+ label: nested-virt-ubuntu-focal
+ groups:
+ - name: tempest
+ nodes:
+ - controller
+
+# Base nested switch job for non EM releases
+- job:
+ name: neutron-tempest-plugin-scenario-nested-switch
+ parent: neutron-tempest-plugin-scenario
+ abstract: true
+ branches: ^(?!stable/(queens|rocky|stein|train|ussuri)).*$
+ # Comment nodeset and vars to switch back to non nested nodes
+ nodeset: neutron-nested-virt-ubuntu-focal
+ vars:
+ devstack_localrc:
+ LIBVIRT_TYPE: kvm
+ LIBVIRT_CPU_MODE: host-passthrough
+ CIRROS_VERSION: 0.5.1
+ DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-disk
+ DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-disk.img
+
+# Base nested switch job for EM releases
+- job:
+ name: neutron-tempest-plugin-scenario-nested-switch
+ parent: neutron-tempest-plugin-scenario
+ abstract: true
+ branches: ^(stable/(queens|rocky|stein|train|ussuri)).*$
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index a492ddb..bd2ae09 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -100,19 +100,12 @@
- ^rally-jobs/.*$
- ^vagrant/.*$
- ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
+ - ^zuul.d/base-nested-switch.yaml$
- job:
name: neutron-tempest-plugin-scenario
parent: neutron-tempest-plugin-base
abstract: true
- nodeset:
- nodes:
- - name: controller
- label: nested-virt-ubuntu-focal
- groups:
- - name: tempest
- nodes:
- - controller
description: |
Perform setup common to all tempest scenario test jobs.
vars:
@@ -125,12 +118,7 @@
(^tempest.api.compute.servers.test_attach_interfaces)|\
(^tempest.api.compute.servers.test_multiple_create)"
devstack_localrc:
- LIBVIRT_TYPE: kvm
- LIBVIRT_CPU_MODE: host-passthrough
PHYSICAL_NETWORK: default
- CIRROS_VERSION: 0.5.1
- DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-disk
- DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-disk.img
IMAGE_URLS: https://cloud-images.ubuntu.com/minimal/releases/focal/release/ubuntu-20.04-minimal-cloudimg-amd64.img
ADVANCED_IMAGE_NAME: ubuntu-20.04-minimal-cloudimg-amd64
ADVANCED_INSTANCE_TYPE: ntp_image_256M
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 7d21fed..90ba9a4 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -130,11 +130,12 @@
- ^rally-jobs/.*$
- ^vagrant/.*$
- ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
+ - ^zuul.d/base-nested-switch.yaml$
- job:
name: neutron-tempest-plugin-scenario-openvswitch
- parent: neutron-tempest-plugin-scenario
+ parent: neutron-tempest-plugin-scenario-nested-switch
timeout: 10000
vars:
devstack_services:
@@ -206,10 +207,11 @@
- ^rally-jobs/.*$
- ^vagrant/.*$
- ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
+ - ^zuul.d/base-nested-switch.yaml$
- job:
name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid
- parent: neutron-tempest-plugin-scenario
+ parent: neutron-tempest-plugin-scenario-nested-switch
timeout: 10000
vars:
devstack_services:
@@ -291,6 +293,7 @@
- ^rally-jobs/.*$
- ^vagrant/.*$
- ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
+ - ^zuul.d/base-nested-switch.yaml$
- job:
name: neutron-tempest-plugin-scenario-openvswitch-distributed-dhcp
@@ -322,7 +325,7 @@
- job:
name: neutron-tempest-plugin-scenario-linuxbridge
- parent: neutron-tempest-plugin-scenario
+ parent: neutron-tempest-plugin-scenario-nested-switch
timeout: 10000
roles:
- zuul: openstack/neutron
@@ -411,10 +414,11 @@
- ^rally-jobs/.*$
- ^vagrant/.*$
- ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
+ - ^zuul.d/base-nested-switch.yaml$
- job:
name: neutron-tempest-plugin-scenario-ovn
- parent: neutron-tempest-plugin-scenario
+ parent: neutron-tempest-plugin-scenario-nested-switch
timeout: 10800
vars:
network_api_extensions: *api_extensions
@@ -540,6 +544,7 @@
- ^rally-jobs/.*$
- ^vagrant/.*$
- ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
+ - ^zuul.d/base-nested-switch.yaml$
- job:
name: neutron-tempest-plugin-dvr-multinode-scenario
@@ -732,7 +737,7 @@
- job:
name: neutron-tempest-plugin-designate-scenario
- parent: neutron-tempest-plugin-scenario
+ parent: neutron-tempest-plugin-scenario-nested-switch
description: Neutron designate integration scenario
required-projects:
- openstack/designate
@@ -781,6 +786,7 @@
- ^rally-jobs/.*$
- ^vagrant/.*$
- ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
+ - ^zuul.d/base-nested-switch.yaml$
- job:
name: neutron-tempest-plugin-sfc
@@ -843,6 +849,7 @@
- ^rally-jobs/.*$
- ^vagrant/.*$
- ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
+ - ^zuul.d/base-nested-switch.yaml$
- job:
name: neutron-tempest-plugin-bgpvpn-bagpipe
@@ -901,6 +908,7 @@
- ^rally-jobs/.*$
- ^vagrant/.*$
- ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
+ - ^zuul.d/base-nested-switch.yaml$
- job:
name: neutron-tempest-plugin-dynamic-routing
@@ -964,6 +972,7 @@
- ^rally-jobs/.*$
- ^vagrant/.*$
- ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
+ - ^zuul.d/base-nested-switch.yaml$
- job:
name: neutron-tempest-plugin-vpnaas
@@ -1022,6 +1031,7 @@
- ^rally-jobs/.*$
- ^vagrant/.*$
- ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
+ - ^zuul.d/base-nested-switch.yaml$
- job:
name: neutron-tempest-plugin-tap-as-a-service
@@ -1124,3 +1134,4 @@
- ^rally-jobs/.*$
- ^vagrant/.*$
- ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
+ - ^zuul.d/base-nested-switch.yaml$