Add nodeset ubuntu2204-openstack-multi-node-mixed
Change-Id: Ib50560bb2b4606fd5fbbecdfc6aa605dac669438
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index b0017c1..7a4e5ea 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -50,6 +50,10 @@
min-ready: 0
- name: os-ubuntu2004-large
min-ready: 0
+ - name: os-ubuntu2204-small
+ min-ready: 0
+ - name: os-ubuntu2204-large
+ min-ready: 0
providers:
- name: openstack-testing
cloud: openstack-testing
@@ -61,6 +65,9 @@
- name: os-ubuntu2004
image-name: Ubuntu20.04-iSCSI
username: ubuntu
+ - name: os-ubuntu2204
+ image-name: Ubuntu22.04-iSCSI
+ username: ubuntu
pools:
- name: main
max-servers: 4
@@ -73,6 +80,17 @@
- "Remote Access"
- "Nodepool Node"
labels:
+ - name: os-ubuntu2204-small
+ flavor-name: m1.small
+ cloud-image: os-ubuntu2204
+ key-name: spfactory-zuul-nodepool-key
+ boot-from-volume: True
+ - name: os-ubuntu2004-large
+ flavor-name: m1.xlarge
+ cloud-image: os-ubuntu2204
+ key-name: spfactory-zuul-nodepool-key
+ boot-from-volume: True
+ volume-size: 100
- name: os-ubuntu2004-small
flavor-name: m1.small
cloud-image: os-ubuntu2004
diff --git a/zuul.d/sp-cinder.yaml b/zuul.d/sp-cinder.yaml
index daa1c55..25e96f1 100644
--- a/zuul.d/sp-cinder.yaml
+++ b/zuul.d/sp-cinder.yaml
@@ -95,6 +95,20 @@
nodes:
- controller
+- nodeset:
+ name: ubuntu2204-openstack-multi-node-mixed
+ nodes:
+ - name: controller
+ label: os-ubuntu2204-large
+ - name: undercloud-client
+ label: os-ubuntu2204-small
+ - name: lab-sp-a1
+ label: os-ubuntu2204-large
+ groups:
+ - name: tempest
+ nodes:
+ - controller
+
- job:
name: cinder-storpool-tempest-iscsi-multipath-parent
parent: tempest-full