From 3690b5305d5d9b8fdeff554cbfcd2497de3e6804 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Fri, 22 Aug 2025 08:57:24 +0200 Subject: CI: Rename nodesets to reflect 8GB/16GB split Switch some Ubuntu jobs to 16GB because they hit OOM with proxysql and running instances in QEMU/KVM. Rename kolla-ansible-noble to kolla-ansible-ubuntu-noble Change-Id: Ia0f7d349ce66482cc6063d6002453746ed8854a1 Signed-off-by: Michal Nasiadka --- zuul.d/jobs.yaml | 66 +++++++++++++++++++++++++------------------------- zuul.d/nodesets.yaml | 68 ++++++++++++++++++++++++++++++---------------------- 2 files changed, 72 insertions(+), 62 deletions(-) (limited to 'zuul.d') diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index cba668278..bc59cde85 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -12,7 +12,7 @@ - job: name: kolla-ansible-centos10s parent: kolla-ansible-base - nodeset: kolla-ansible-centos10s + nodeset: kolla-ansible-centos10s-8GB voting: false vars: base_distro: centos @@ -22,12 +22,12 @@ - job: name: kolla-ansible-centos10s-aarch64 parent: kolla-ansible-centos10s - nodeset: kolla-ansible-centos10s-aarch64 + nodeset: kolla-ansible-centos10s-aarch64-8GB - job: name: kolla-ansible-debian-aarch64 parent: kolla-ansible-debian - nodeset: kolla-ansible-debian-bookworm-aarch64 + nodeset: kolla-ansible-debian-bookworm-aarch64-8GB timeout: 10800 voting: false required-projects: @@ -36,7 +36,7 @@ - job: name: kolla-ansible-debian-aarch64-podman parent: kolla-ansible-debian - nodeset: kolla-ansible-debian-bookworm-aarch64 + nodeset: kolla-ansible-debian-bookworm-aarch64-8GB timeout: 10800 voting: false vars: @@ -81,7 +81,7 @@ - job: name: kolla-ansible-ubuntu parent: kolla-ansible-base - nodeset: kolla-ansible-noble + nodeset: kolla-ansible-ubuntu-noble-16GB vars: base_distro: ubuntu tls_enabled: true @@ -89,7 +89,7 @@ - job: name: kolla-ansible-ubuntu-podman parent: kolla-ansible-base - nodeset: kolla-ansible-noble + nodeset: kolla-ansible-ubuntu-noble-16GB vars: base_distro: ubuntu tls_enabled: true @@ -105,7 +105,7 @@ - job: name: kolla-ansible-ubuntu-kvm parent: kolla-ansible-kvm-base - nodeset: kolla-ansible-noble-nested-virt + nodeset: kolla-ansible-ubuntu-noble-nested-virt vars: base_distro: ubuntu @@ -119,7 +119,7 @@ - job: name: kolla-ansible-ubuntu-multinode-ipv6 parent: kolla-ansible-ipv6-base - nodeset: kolla-ansible-noble-multi + nodeset: kolla-ansible-ubuntu-noble-multi-8GB vars: base_distro: ubuntu @@ -135,7 +135,7 @@ - job: name: kolla-ansible-ubuntu-cephadm parent: kolla-ansible-cephadm-base - nodeset: kolla-ansible-noble-multi + nodeset: kolla-ansible-ubuntu-noble-multi-16GB timeout: 10800 vars: base_distro: ubuntu @@ -158,7 +158,7 @@ - job: name: kolla-ansible-ubuntu-mariadb parent: kolla-ansible-mariadb-base - nodeset: kolla-ansible-noble-multi + nodeset: kolla-ansible-ubuntu-noble-multi-8GB vars: base_distro: ubuntu @@ -209,13 +209,13 @@ - job: name: kolla-ansible-debian-upgrade-aarch64 parent: kolla-ansible-debian-upgrade - nodeset: kolla-ansible-debian-bookworm-aarch64 + nodeset: kolla-ansible-debian-bookworm-aarch64-8GB voting: false - job: name: kolla-ansible-ubuntu-upgrade parent: kolla-ansible-base - nodeset: kolla-ansible-noble + nodeset: kolla-ansible-ubuntu-noble-16GB timeout: 10800 vars: base_distro: ubuntu @@ -225,7 +225,7 @@ - job: name: kolla-ansible-ubuntu-slurp-upgrade parent: kolla-ansible-base - nodeset: kolla-ansible-noble + nodeset: kolla-ansible-ubuntu-noble-16GB timeout: 9000 vars: base_distro: ubuntu @@ -257,7 +257,7 @@ - job: name: kolla-ansible-ubuntu-upgrade-cephadm parent: kolla-ansible-cephadm-base - nodeset: kolla-ansible-noble-multi + nodeset: kolla-ansible-ubuntu-noble-multi-16GB timeout: 10800 vars: base_distro: ubuntu @@ -267,7 +267,7 @@ - job: name: kolla-ansible-ubuntu-slurp-upgrade-cephadm parent: kolla-ansible-cephadm-base - nodeset: kolla-ansible-noble-multi + nodeset: kolla-ansible-ubuntu-noble-multi-16GB timeout: 9000 vars: base_distro: ubuntu @@ -297,7 +297,7 @@ - job: name: kolla-ansible-ubuntu-upgrade-ovn parent: kolla-ansible-ovn-base - nodeset: kolla-ansible-noble-multi + nodeset: kolla-ansible-ubuntu-noble-multi-16GB timeout: 10800 vars: base_distro: ubuntu @@ -313,7 +313,7 @@ - job: name: kolla-ansible-ubuntu-bifrost parent: kolla-ansible-bifrost-base - nodeset: kolla-ansible-noble + nodeset: kolla-ansible-ubuntu-noble-8GB vars: base_distro: ubuntu @@ -327,7 +327,7 @@ - job: name: kolla-ansible-ubuntu-zun parent: kolla-ansible-zun-base - nodeset: kolla-ansible-noble-multi + nodeset: kolla-ansible-ubuntu-noble-multi-8GB vars: base_distro: ubuntu @@ -355,7 +355,7 @@ - job: name: kolla-ansible-ubuntu-ironic parent: kolla-ansible-ironic-base - nodeset: kolla-ansible-noble + nodeset: kolla-ansible-ubuntu-noble-8GB vars: base_distro: ubuntu @@ -369,7 +369,7 @@ - job: name: kolla-ansible-ubuntu-magnum parent: kolla-ansible-magnum-base - nodeset: kolla-ansible-noble + nodeset: kolla-ansible-ubuntu-noble-8GB vars: base_distro: ubuntu @@ -383,14 +383,14 @@ - job: name: kolla-ansible-ubuntu-octavia parent: kolla-ansible-octavia-base - nodeset: kolla-ansible-noble + nodeset: kolla-ansible-ubuntu-noble-16GB vars: base_distro: ubuntu - job: name: kolla-ansible-ubuntu-masakari parent: kolla-ansible-masakari-base - nodeset: kolla-ansible-noble-masakari + nodeset: kolla-ansible-ubuntu-noble-masakari-8GB vars: base_distro: ubuntu @@ -404,7 +404,7 @@ - job: name: kolla-ansible-ubuntu-cells parent: kolla-ansible-cells-base - nodeset: kolla-ansible-noble-multi + nodeset: kolla-ansible-ubuntu-noble-multi-16GB vars: base_distro: ubuntu @@ -432,14 +432,14 @@ - job: name: kolla-ansible-ubuntu-ovn parent: kolla-ansible-ovn-base - nodeset: kolla-ansible-noble-multi + nodeset: kolla-ansible-ubuntu-noble-multi-16GB vars: base_distro: ubuntu - job: name: kolla-ansible-ubuntu-lets-encrypt parent: kolla-ansible-lets-encrypt-base - nodeset: kolla-ansible-noble-multi + nodeset: kolla-ansible-ubuntu-noble-multi-16GB vars: base_distro: ubuntu @@ -460,7 +460,7 @@ - job: name: kolla-ansible-ubuntu-prometheus-opensearch parent: kolla-ansible-prometheus-opensearch-base - nodeset: kolla-ansible-noble + nodeset: kolla-ansible-ubuntu-noble-8GB vars: base_distro: ubuntu @@ -475,7 +475,7 @@ - job: name: kolla-ansible-ubuntu-prometheus-opensearch-upgrade parent: kolla-ansible-prometheus-opensearch-base - nodeset: kolla-ansible-noble + nodeset: kolla-ansible-ubuntu-noble-8GB vars: base_distro: ubuntu is_upgrade: yes @@ -490,7 +490,7 @@ - job: name: kolla-ansible-ubuntu-venus parent: kolla-ansible-venus-base - nodeset: kolla-ansible-noble + nodeset: kolla-ansible-ubuntu-noble-8GB vars: base_distro: ubuntu @@ -512,7 +512,7 @@ - job: name: kolla-ansible-ubuntu-haproxy-fqdn parent: kolla-ansible-haproxy-base - nodeset: kolla-ansible-noble + nodeset: kolla-ansible-ubuntu-noble-8GB vars: base_distro: ubuntu tls_enabled: true @@ -520,7 +520,7 @@ - job: name: kolla-ansible-ubuntu-skyline parent: kolla-ansible-skyline-base - nodeset: kolla-ansible-noble + nodeset: kolla-ansible-ubuntu-noble-8GB vars: base_distro: ubuntu @@ -534,7 +534,7 @@ - job: name: kolla-ansible-ubuntu-skyline-sso parent: kolla-ansible-skyline-sso-base - nodeset: kolla-ansible-noble + nodeset: kolla-ansible-ubuntu-noble-8GB vars: base_distro: ubuntu @@ -562,14 +562,14 @@ - job: name: kolla-ansible-ubuntu-container-engine-migration parent: kolla-ansible-container-engine-migration-base - nodeset: kolla-ansible-noble + nodeset: kolla-ansible-ubuntu-noble-8GB vars: base_distro: ubuntu - job: name: kolla-ansible-ubuntu-container-engine-migration-multinode parent: kolla-ansible-container-engine-migration-base - nodeset: kolla-ansible-noble-multi + nodeset: kolla-ansible-ubuntu-noble-multi-8GB vars: base_distro: ubuntu diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml index 1ae5bd1b7..68565fba6 100644 --- a/zuul.d/nodesets.yaml +++ b/zuul.d/nodesets.yaml @@ -1,27 +1,21 @@ --- - nodeset: - name: kolla-ansible-centos9s - nodes: - - name: primary - label: centos-9-stream - -- nodeset: - name: kolla-ansible-centos10s + name: kolla-ansible-centos10s-8GB nodes: - name: primary label: centos-10-stream-8GB - nodeset: - name: kolla-ansible-centos10s-aarch64 + name: kolla-ansible-centos10s-aarch64-8GB nodes: - name: primary label: centos-10-stream-arm64-8GB - nodeset: - name: kolla-ansible-debian-bookworm + name: kolla-ansible-debian-bookworm-8GB nodes: - name: primary - label: debian-bookworm + label: debian-bookworm-8GB - nodeset: name: kolla-ansible-debian-bookworm-16GB @@ -30,26 +24,32 @@ label: debian-bookworm-16GB - nodeset: - name: kolla-ansible-debian-bookworm-aarch64 + name: kolla-ansible-debian-bookworm-aarch64-8GB + nodes: + - name: primary + label: debian-bookworm-arm64-8GB + +- nodeset: + name: kolla-ansible-ubuntu-noble-8GB nodes: - name: primary - label: debian-bookworm-arm64 + label: ubuntu-noble-8GB - nodeset: - name: kolla-ansible-noble + name: kolla-ansible-ubuntu-noble-16GB nodes: - name: primary - label: ubuntu-noble + label: ubuntu-noble-16GB - nodeset: - name: kolla-ansible-debian-bookworm-multi + name: kolla-ansible-debian-bookworm-multi-8GB nodes: - name: primary - label: debian-bookworm + label: debian-bookworm-8GB - name: secondary1 - label: debian-bookworm + label: debian-bookworm-8GB - name: secondary2 - label: debian-bookworm + label: debian-bookworm-8GB - nodeset: name: kolla-ansible-debian-bookworm-multi-16GB @@ -68,14 +68,24 @@ label: rockylinux-9 - nodeset: - name: kolla-ansible-noble-multi + name: kolla-ansible-ubuntu-noble-multi-8GB + nodes: + - name: primary + label: ubuntu-noble-8GB + - name: secondary1 + label: ubuntu-noble-8GB + - name: secondary2 + label: ubuntu-noble-8GB + +- nodeset: + name: kolla-ansible-ubuntu-noble-multi-16GB nodes: - name: primary - label: ubuntu-noble + label: ubuntu-noble-16GB - name: secondary1 - label: ubuntu-noble + label: ubuntu-noble-16GB - name: secondary2 - label: ubuntu-noble + label: ubuntu-noble-16GB - nodeset: name: kolla-ansible-rocky9-multi @@ -88,10 +98,10 @@ label: rockylinux-9 - nodeset: - name: kolla-ansible-noble-nested-virt + name: kolla-ansible-ubuntu-noble-nested-virt nodes: - name: primary - label: nested-virt-ubuntu-noble + label: ubuntu-noble-nested-virt-8GB - nodeset: name: kolla-ansible-rocky9-nested-virt @@ -100,16 +110,16 @@ label: nested-virt-centos-9-stream - nodeset: - name: kolla-ansible-noble-masakari + name: kolla-ansible-ubuntu-noble-masakari-8GB nodes: - name: primary - label: ubuntu-noble + label: ubuntu-noble-8GB - name: secondary - label: ubuntu-noble + label: ubuntu-noble-8GB - name: ternary1 - label: ubuntu-noble + label: ubuntu-noble-8GB - name: ternary2 - label: ubuntu-noble + label: ubuntu-noble-8GB - nodeset: name: kolla-ansible-rocky9-masakari -- cgit v1.2.3