Update nested-virt testing for the 2023.1 cycle
Since the new main platform for testing is now Ubuntu Jammy, switch the
nested-virt jobs as well. In order to be able to keep the previous setup
for stable/zed and older branches, we add explicit nodeset overrides for
the affected jobs.
Cirros 0.5.1 seems to have issues booting on Jammy hosts, update to the
latest stable release 0.5.2.
Depends-on: https://review.opendev.org/c/openstack/devstack/+/860795
Change-Id: Ie835afa301e7fd17fb751b932adac74141e0e9a4
diff --git a/zuul.d/base-nested-switch.yaml b/zuul.d/base-nested-switch.yaml
index dcc0175..959b5ed 100644
--- a/zuul.d/base-nested-switch.yaml
+++ b/zuul.d/base-nested-switch.yaml
@@ -8,12 +8,38 @@
nodes:
- controller
-# Base nested switch job for non EM releases
+- nodeset:
+ name: neutron-nested-virt-ubuntu-jammy
+ nodes:
+ - name: controller
+ label: nested-virt-ubuntu-jammy
+ groups:
+ - name: tempest
+ nodes:
+ - controller
+
+# Base nested switch job for 2023.1 and later
- job:
name: neutron-tempest-plugin-base-nested-switch
parent: neutron-tempest-plugin-base
abstract: true
- branches: ^(?!stable/(queens|rocky|stein|train|ussuri)).*$
+ branches: ^(?!stable/(queens|rocky|stein|train|ussuri|victoria|wallaby|xena|yoga|zed)).*$
+ # Comment nodeset and vars to switch back to non nested nodes
+ nodeset: neutron-nested-virt-ubuntu-jammy
+ vars:
+ devstack_localrc:
+ LIBVIRT_TYPE: kvm
+ LIBVIRT_CPU_MODE: host-passthrough
+ CIRROS_VERSION: 0.5.2
+ DEFAULT_IMAGE_NAME: cirros-0.5.2-x86_64-disk
+ DEFAULT_IMAGE_FILE_NAME: cirros-0.5.2-x86_64-disk.img
+
+# Base nested switch job for victoria through zed
+- job:
+ name: neutron-tempest-plugin-base-nested-switch
+ parent: neutron-tempest-plugin-base
+ abstract: true
+ branches: ^stable/(victoria|wallaby|xena|yoga|zed)$
# Comment nodeset and vars to switch back to non nested nodes
nodeset: neutron-nested-virt-ubuntu-focal
vars:
@@ -29,4 +55,4 @@
name: neutron-tempest-plugin-scenario-nested-switch
parent: neutron-tempest-plugin-base
abstract: true
- branches: ^(stable/(queens|rocky|stein|train|ussuri)).*$
+ branches: ^stable/(queens|rocky|stein|train|ussuri)$
diff --git a/zuul.d/wallaby_jobs.yaml b/zuul.d/wallaby_jobs.yaml
index a3c07c0..8f4d1aa 100644
--- a/zuul.d/wallaby_jobs.yaml
+++ b/zuul.d/wallaby_jobs.yaml
@@ -93,6 +93,7 @@
name: neutron-tempest-plugin-scenario-openvswitch-wallaby
parent: neutron-tempest-plugin-openvswitch
override-checkout: stable/wallaby
+ nodeset: neutron-nested-virt-ubuntu-focal
vars:
branch_override: stable/wallaby
tempest_test_regex: "\
@@ -113,6 +114,7 @@
name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-wallaby
parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
override-checkout: stable/wallaby
+ nodeset: neutron-nested-virt-ubuntu-focal
vars:
branch_override: stable/wallaby
tempest_test_regex: "\
@@ -133,6 +135,7 @@
name: neutron-tempest-plugin-scenario-linuxbridge-wallaby
parent: neutron-tempest-plugin-linuxbridge
override-checkout: stable/wallaby
+ nodeset: neutron-nested-virt-ubuntu-focal
vars:
branch_override: stable/wallaby
tempest_test_regex: "\
@@ -153,6 +156,7 @@
name: neutron-tempest-plugin-scenario-ovn-wallaby
parent: neutron-tempest-plugin-ovn
override-checkout: stable/wallaby
+ nodeset: neutron-nested-virt-ubuntu-focal
vars:
branch_override: stable/wallaby
tempest_test_regex: "\
@@ -180,6 +184,7 @@
name: neutron-tempest-plugin-designate-scenario-wallaby
parent: neutron-tempest-plugin-designate-scenario
override-checkout: stable/wallaby
+ nodeset: neutron-nested-virt-ubuntu-focal
vars:
branch_override: stable/wallaby
network_api_extensions_common: *api_extensions
diff --git a/zuul.d/xena_jobs.yaml b/zuul.d/xena_jobs.yaml
index e0a58a7..a5b3d14 100644
--- a/zuul.d/xena_jobs.yaml
+++ b/zuul.d/xena_jobs.yaml
@@ -95,6 +95,7 @@
name: neutron-tempest-plugin-scenario-openvswitch-xena
parent: neutron-tempest-plugin-openvswitch
override-checkout: stable/xena
+ nodeset: neutron-nested-virt-ubuntu-focal
vars:
branch_override: stable/xena
tempest_test_regex: "\
@@ -115,6 +116,7 @@
name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-xena
parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
override-checkout: stable/xena
+ nodeset: neutron-nested-virt-ubuntu-focal
vars:
branch_override: stable/xena
tempest_test_regex: "\
@@ -135,6 +137,7 @@
name: neutron-tempest-plugin-scenario-linuxbridge-xena
parent: neutron-tempest-plugin-linuxbridge
override-checkout: stable/xena
+ nodeset: neutron-nested-virt-ubuntu-focal
vars:
branch_override: stable/xena
tempest_test_regex: "\
@@ -155,6 +158,7 @@
name: neutron-tempest-plugin-scenario-ovn-xena
parent: neutron-tempest-plugin-ovn
override-checkout: stable/xena
+ nodeset: neutron-nested-virt-ubuntu-focal
vars:
branch_override: stable/xena
tempest_test_regex: "\
@@ -182,6 +186,7 @@
name: neutron-tempest-plugin-designate-scenario-xena
parent: neutron-tempest-plugin-designate-scenario
override-checkout: stable/xena
+ nodeset: neutron-nested-virt-ubuntu-focal
vars:
branch_override: stable/xena
network_api_extensions_common: *api_extensions
diff --git a/zuul.d/yoga_jobs.yaml b/zuul.d/yoga_jobs.yaml
index bc88c83..06bbd4e 100644
--- a/zuul.d/yoga_jobs.yaml
+++ b/zuul.d/yoga_jobs.yaml
@@ -97,6 +97,7 @@
name: neutron-tempest-plugin-scenario-openvswitch-yoga
parent: neutron-tempest-plugin-openvswitch
override-checkout: stable/yoga
+ nodeset: neutron-nested-virt-ubuntu-focal
vars:
branch_override: stable/yoga
tempest_test_regex: "\
@@ -117,6 +118,7 @@
name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-yoga
parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
override-checkout: stable/yoga
+ nodeset: neutron-nested-virt-ubuntu-focal
vars:
branch_override: stable/yoga
tempest_test_regex: "\
@@ -137,6 +139,7 @@
name: neutron-tempest-plugin-scenario-linuxbridge-yoga
parent: neutron-tempest-plugin-linuxbridge
override-checkout: stable/yoga
+ nodeset: neutron-nested-virt-ubuntu-focal
vars:
branch_override: stable/yoga
tempest_test_regex: "\
@@ -157,6 +160,7 @@
name: neutron-tempest-plugin-scenario-ovn-yoga
parent: neutron-tempest-plugin-ovn
override-checkout: stable/yoga
+ nodeset: neutron-nested-virt-ubuntu-focal
vars:
branch_override: stable/yoga
tempest_test_regex: "\
@@ -186,6 +190,7 @@
name: neutron-tempest-plugin-designate-scenario-yoga
parent: neutron-tempest-plugin-designate-scenario
override-checkout: stable/yoga
+ nodeset: neutron-nested-virt-ubuntu-focal
vars:
branch_override: stable/yoga
network_api_extensions_common: *api_extensions
diff --git a/zuul.d/zed_jobs.yaml b/zuul.d/zed_jobs.yaml
index 097df53..2178737 100644
--- a/zuul.d/zed_jobs.yaml
+++ b/zuul.d/zed_jobs.yaml
@@ -2,6 +2,7 @@
name: neutron-tempest-plugin-openvswitch-zed
parent: neutron-tempest-plugin-openvswitch
override-checkout: stable/zed
+ nodeset: neutron-nested-virt-ubuntu-focal
vars:
branch_override: stable/zed
network_api_extensions_openvswitch:
@@ -108,6 +109,7 @@
name: neutron-tempest-plugin-openvswitch-iptables_hybrid-zed
parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
override-checkout: stable/zed
+ nodeset: neutron-nested-virt-ubuntu-focal
vars:
branch_override: stable/zed
network_api_extensions_openvswitch:
@@ -138,6 +140,7 @@
name: neutron-tempest-plugin-linuxbridge-zed
parent: neutron-tempest-plugin-linuxbridge
override-checkout: stable/zed
+ nodeset: neutron-nested-virt-ubuntu-focal
vars:
branch_override: stable/zed
network_api_extensions_linuxbridge:
@@ -164,6 +167,7 @@
name: neutron-tempest-plugin-ovn-zed
parent: neutron-tempest-plugin-ovn
override-checkout: stable/zed
+ nodeset: neutron-nested-virt-ubuntu-focal
vars:
branch_override: stable/zed
tempest_test_regex: "\
@@ -196,6 +200,7 @@
name: neutron-tempest-plugin-designate-scenario-zed
parent: neutron-tempest-plugin-designate-scenario
override-checkout: stable/zed
+ nodeset: neutron-nested-virt-ubuntu-focal
vars:
branch_override: stable/zed
network_api_extensions_common: *api_extensions