Skip to content

Commit e40b2be

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "CI: Use 16GB nodes for debian-bookworm nodes" into stable/2025.1
2 parents faa8be9 + 819f011 commit e40b2be

File tree

2 files changed

+26
-10
lines changed

2 files changed

+26
-10
lines changed

zuul.d/jobs.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
- job:
3333
name: kolla-ansible-debian
3434
parent: kolla-ansible-base
35-
nodeset: kolla-ansible-debian-bookworm
35+
nodeset: kolla-ansible-debian-bookworm-16GB
3636
vars:
3737
base_distro: debian
3838
tls_enabled: true
3939

4040
- job:
4141
name: kolla-ansible-debian-podman
4242
parent: kolla-ansible-base
43-
nodeset: kolla-ansible-debian-bookworm
43+
nodeset: kolla-ansible-debian-bookworm-16GB
4444
vars:
4545
base_distro: debian
4646
tls_enabled: true
@@ -129,7 +129,7 @@
129129
- job:
130130
name: kolla-ansible-debian-mariadb
131131
parent: kolla-ansible-mariadb-base
132-
nodeset: kolla-ansible-debian-bookworm-multi
132+
nodeset: kolla-ansible-debian-bookworm-multi-16GB
133133
vars:
134134
base_distro: debian
135135

@@ -172,7 +172,7 @@
172172
- job:
173173
name: kolla-ansible-debian-upgrade
174174
parent: kolla-ansible-base
175-
nodeset: kolla-ansible-debian-bookworm
175+
nodeset: kolla-ansible-debian-bookworm-16GB
176176
timeout: 10800
177177
vars:
178178
base_distro: debian
@@ -182,7 +182,7 @@
182182
- job:
183183
name: kolla-ansible-debian-slurp-upgrade
184184
parent: kolla-ansible-base
185-
nodeset: kolla-ansible-debian-bookworm
185+
nodeset: kolla-ansible-debian-bookworm-16GB
186186
timeout: 9000
187187
vars:
188188
base_distro: debian
@@ -273,7 +273,7 @@
273273
- job:
274274
name: kolla-ansible-debian-upgrade-ovn
275275
parent: kolla-ansible-ovn-base
276-
nodeset: kolla-ansible-debian-bookworm-multi
276+
nodeset: kolla-ansible-debian-bookworm-multi-16GB
277277
timeout: 10800
278278
vars:
279279
base_distro: debian
@@ -333,7 +333,7 @@
333333
- job:
334334
name: kolla-ansible-debian-ironic
335335
parent: kolla-ansible-ironic-base
336-
nodeset: kolla-ansible-debian-bookworm
336+
nodeset: kolla-ansible-debian-bookworm-16GB
337337
vars:
338338
base_distro: debian
339339

@@ -410,7 +410,7 @@
410410
- job:
411411
name: kolla-ansible-debian-ovn
412412
parent: kolla-ansible-ovn-base
413-
nodeset: kolla-ansible-debian-bookworm-multi
413+
nodeset: kolla-ansible-debian-bookworm-multi-16GB
414414
vars:
415415
base_distro: debian
416416

@@ -561,13 +561,13 @@
561561
- job:
562562
name: kolla-ansible-debian-container-engine-migration
563563
parent: kolla-ansible-container-engine-migration-base
564-
nodeset: kolla-ansible-debian-bookworm
564+
nodeset: kolla-ansible-debian-bookworm-16GB
565565
vars:
566566
base_distro: debian
567567

568568
- job:
569569
name: kolla-ansible-debian-container-engine-migration-multinode
570570
parent: kolla-ansible-container-engine-migration-base
571-
nodeset: kolla-ansible-debian-bookworm-multi
571+
nodeset: kolla-ansible-debian-bookworm-multi-16GB
572572
vars:
573573
base_distro: debian

zuul.d/nodesets.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
- name: primary
1212
label: debian-bookworm
1313

14+
- nodeset:
15+
name: kolla-ansible-debian-bookworm-16GB
16+
nodes:
17+
- name: primary
18+
label: debian-bookworm-16GB
19+
1420
- nodeset:
1521
name: kolla-ansible-debian-bookworm-aarch64
1622
nodes:
@@ -33,6 +39,16 @@
3339
- name: secondary2
3440
label: debian-bookworm
3541

42+
- nodeset:
43+
name: kolla-ansible-debian-bookworm-multi-16GB
44+
nodes:
45+
- name: primary
46+
label: debian-bookworm-16GB
47+
- name: secondary1
48+
label: debian-bookworm-16GB
49+
- name: secondary2
50+
label: debian-bookworm-16GB
51+
3652
- nodeset:
3753
name: kolla-ansible-rocky9
3854
nodes:

0 commit comments

Comments
 (0)