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)$