Run all but Zaza jobs in parallel
Only Zaza jobs are resource-constrained and need to be run one at a
time.
The rest of the jobs can be run in parallel.
Change-Id: I77d3b141d476edca5fdc5d3ea2ddacc1a30f311c
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index e197857..cdc1810 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -42,7 +42,9 @@
labels:
- name: centos-base
min-ready: 0
- - name: os-ubuntu-focal
+ - name: charm-main-os-ubuntu-focal
+ min-ready: 0
+ - name: charm-zaza-os-ubuntu-focal
min-ready: 0
providers:
- name: openstack-testing
@@ -68,7 +70,20 @@
flavor-name: m1.xlarge
boot-from-volume: True
volume-size: 80
- - name: zaza-main
+ - name: charm-main
+ max-servers: 4
+ auto-floating-ip: False
+ security-groups:
+ - pp-net
+ - "Remote Access"
+ networks:
+ - lab-charmed-testing-ssh
+ labels:
+ - name: charm-main-os-ubuntu-focal
+ flavor-name: m1.small
+ cloud-image: ubuntu-focal
+ key-name: spfactory-zuul-nodepool-key
+ - name: charm-zaza
max-servers: 1
auto-floating-ip: False
security-groups:
@@ -77,7 +92,7 @@
networks:
- lab-charmed-testing-ssh
labels:
- - name: os-ubuntu-focal
+ - name: charm-zaza-os-ubuntu-focal
flavor-name: m1.small
cloud-image: ubuntu-focal
key-name: spfactory-zuul-nodepool-key
diff --git a/zuul.d/charm-cinder-storpool-iscsi.yaml b/zuul.d/charm-cinder-storpool-iscsi.yaml
index 7207178..16060cf 100644
--- a/zuul.d/charm-cinder-storpool-iscsi.yaml
+++ b/zuul.d/charm-cinder-storpool-iscsi.yaml
@@ -7,7 +7,7 @@
nodeset:
nodes:
- name: controller
- label: os-ubuntu-focal
+ label: charm-zaza-os-ubuntu-focal
secrets:
- name: SP_PUBLIC_SPACE
secret: SP_PUBLIC_SPACE
@@ -92,7 +92,7 @@
nodeset:
nodes:
- name: controller
- label: os-ubuntu-focal
+ label: charm-main-os-ubuntu-focal
- job:
name: charm-tox-black