From 5587c1b7869a09fff5d9753b64b928bb847b46f1 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Tue, 5 Aug 2025 14:56:10 +0200 Subject: Move to for Rocky Linux 10 CephAdm, Octavia, OVN and NFV jobs are not added here, because these rely on Valkey/Redis available. Ironic jobs are not added, because ipxe.efi is not packaged in EL10 and needs a followup patch. Let's Encrypt jobs are also not added, due to ssl certificate validation errors. Depends-On: https://review.opendev.org/c/openstack/kolla/+/956554 Depends-On: https://review.opendev.org/c/openstack/ansible-collection-kolla/+/961237 Change-Id: I51823808c4e4ac08ae8f080aacf6a3759589571d Signed-off-by: Michal Nasiadka --- zuul.d/nodesets.yaml | 44 +++++++++++++++++++++++++++++ zuul.d/scenarios/aio.yaml | 16 +++++++++++ zuul.d/scenarios/bifrost.yaml | 6 ++++ zuul.d/scenarios/cells.yaml | 6 ++++ zuul.d/scenarios/haproxy-fqdn.yaml | 6 ++++ zuul.d/scenarios/hashi-vault.yaml | 6 ++++ zuul.d/scenarios/ipv6.yaml | 6 ++++ zuul.d/scenarios/kvm.yaml | 6 ++++ zuul.d/scenarios/magnum.yaml | 6 ++++ zuul.d/scenarios/mariadb.yaml | 6 ++++ zuul.d/scenarios/masakari.yaml | 6 ++++ zuul.d/scenarios/prometheus-opensearch.yaml | 6 ++++ zuul.d/scenarios/skyline.yaml | 12 ++++++++ zuul.d/scenarios/telemetry.yaml | 6 ++++ 14 files changed, 138 insertions(+) (limited to 'zuul.d') diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml index a28552933..295df62e6 100644 --- a/zuul.d/nodesets.yaml +++ b/zuul.d/nodesets.yaml @@ -67,6 +67,50 @@ - name: primary label: debian-bookworm-nested-virt-8GB +- nodeset: + name: kolla-ansible-rocky-10-8GB + nodes: + - name: primary + label: rockylinux-10-8GB + +- nodeset: + name: kolla-ansible-rocky-10-16GB + nodes: + - name: primary + label: rockylinux-10-16GB + +- nodeset: + name: kolla-ansible-rocky-10-masakari-8GB + nodes: + - name: primary + label: rockylinux-10-8GB + - name: secondary + label: rockylinux-10-8GB + - name: ternary1 + label: rockylinux-10-8GB + - name: ternary2 + label: rockylinux-10-8GB + +- nodeset: + name: kolla-ansible-rocky-10-multi-8GB + nodes: + - name: primary + label: rockylinux-10-8GB + - name: secondary1 + label: rockylinux-10-8GB + - name: secondary2 + label: rockylinux-10-8GB + +- nodeset: + name: kolla-ansible-rocky-10-multi-16GB + nodes: + - name: primary + label: rockylinux-10-16GB + - name: secondary1 + label: rockylinux-10-16GB + - name: secondary2 + label: rockylinux-10-16GB + - nodeset: name: kolla-ansible-ubuntu-noble-8GB nodes: diff --git a/zuul.d/scenarios/aio.yaml b/zuul.d/scenarios/aio.yaml index 5b43461b2..7a624359a 100644 --- a/zuul.d/scenarios/aio.yaml +++ b/zuul.d/scenarios/aio.yaml @@ -61,6 +61,18 @@ nodeset: kolla-ansible-debian-bookworm-16GB timeout: 9000 +- job: + name: kolla-ansible-rocky-10 + parent: kolla-ansible-base + nodeset: kolla-ansible-rocky-10-16GB + +- job: + name: kolla-ansible-rocky-10-podman + parent: kolla-ansible-rocky-10 + nodeset: kolla-ansible-rocky-10-16GB + vars: + container_engine: podman + - job: name: kolla-ansible-ubuntu-noble parent: kolla-ansible-base @@ -95,6 +107,8 @@ - kolla-ansible-debian-bookworm - kolla-ansible-debian-bookworm-podman - kolla-ansible-debian-bookworm-upgrade + - kolla-ansible-rocky-10 + - kolla-ansible-rocky-10-podman - kolla-ansible-ubuntu-noble - kolla-ansible-ubuntu-noble-podman - kolla-ansible-ubuntu-noble-upgrade @@ -109,6 +123,8 @@ - kolla-ansible-debian-bookworm - kolla-ansible-debian-bookworm-podman - kolla-ansible-debian-bookworm-upgrade + - kolla-ansible-rocky-10 + - kolla-ansible-rocky-10-podman - kolla-ansible-ubuntu-noble - kolla-ansible-ubuntu-noble-upgrade - kolla-ansible-ubuntu-noble-podman diff --git a/zuul.d/scenarios/bifrost.yaml b/zuul.d/scenarios/bifrost.yaml index 9c6690052..d4fa31204 100644 --- a/zuul.d/scenarios/bifrost.yaml +++ b/zuul.d/scenarios/bifrost.yaml @@ -16,6 +16,11 @@ parent: kolla-ansible-bifrost-base nodeset: kolla-ansible-debian-bookworm-8GB +- job: + name: kolla-ansible-rocky-10-bifrost + parent: kolla-ansible-bifrost-base + nodeset: kolla-ansible-rocky-10-8GB + - job: name: kolla-ansible-ubuntu-noble-bifrost parent: kolla-ansible-bifrost-base @@ -28,4 +33,5 @@ check: jobs: - kolla-ansible-debian-bookworm-bifrost + - kolla-ansible-rocky-10-bifrost - kolla-ansible-ubuntu-noble-bifrost diff --git a/zuul.d/scenarios/cells.yaml b/zuul.d/scenarios/cells.yaml index ce061af6b..5b546bc8e 100644 --- a/zuul.d/scenarios/cells.yaml +++ b/zuul.d/scenarios/cells.yaml @@ -19,6 +19,11 @@ parent: kolla-ansible-cells-base nodeset: kolla-ansible-debian-bookworm-multi-16GB +- job: + name: kolla-ansible-rocky-10-cells + parent: kolla-ansible-cells-base + nodeset: kolla-ansible-rocky-10-multi-16GB + - job: name: kolla-ansible-ubuntu-noble-cells parent: kolla-ansible-cells-base @@ -31,4 +36,5 @@ check: jobs: - kolla-ansible-debian-bookworm-cells + - kolla-ansible-rocky-10-cells - kolla-ansible-ubuntu-noble-cells diff --git a/zuul.d/scenarios/haproxy-fqdn.yaml b/zuul.d/scenarios/haproxy-fqdn.yaml index 672d7a8b5..a668696a1 100644 --- a/zuul.d/scenarios/haproxy-fqdn.yaml +++ b/zuul.d/scenarios/haproxy-fqdn.yaml @@ -19,6 +19,11 @@ parent: kolla-ansible-haproxy-fqdn-base nodeset: kolla-ansible-debian-bookworm-8GB +- job: + name: kolla-ansible-rocky-10-haproxy-fqdn + parent: kolla-ansible-haproxy-fqdn-base + nodeset: kolla-ansible-rocky-10-8GB + - job: name: kolla-ansible-ubuntu-noble-haproxy-fqdn parent: kolla-ansible-haproxy-fqdn-base @@ -31,4 +36,5 @@ check: jobs: - kolla-ansible-debian-bookworm-haproxy-fqdn + - kolla-ansible-rocky-10-haproxy-fqdn - kolla-ansible-ubuntu-noble-haproxy-fqdn diff --git a/zuul.d/scenarios/hashi-vault.yaml b/zuul.d/scenarios/hashi-vault.yaml index 74c92c445..429285ffd 100644 --- a/zuul.d/scenarios/hashi-vault.yaml +++ b/zuul.d/scenarios/hashi-vault.yaml @@ -20,6 +20,11 @@ parent: kolla-ansible-hashi-vault-base nodeset: kolla-ansible-debian-bookworm-8GB +- job: + name: kolla-ansible-rocky-10-hashi-vault + parent: kolla-ansible-hashi-vault-base + nodeset: kolla-ansible-rocky-10-8GB + - job: name: kolla-ansible-ubuntu-noble-hashi-vault parent: kolla-ansible-hashi-vault-base @@ -32,4 +37,5 @@ check: jobs: - kolla-ansible-debian-bookworm-hashi-vault + - kolla-ansible-rocky-10-hashi-vault - kolla-ansible-ubuntu-noble-hashi-vault diff --git a/zuul.d/scenarios/ipv6.yaml b/zuul.d/scenarios/ipv6.yaml index e45bf0cd6..186b4cc85 100644 --- a/zuul.d/scenarios/ipv6.yaml +++ b/zuul.d/scenarios/ipv6.yaml @@ -23,6 +23,11 @@ parent: kolla-ansible-ipv6-base nodeset: kolla-ansible-debian-bookworm-multi-8GB +- job: + name: kolla-ansible-rocky-10-ipv6 + parent: kolla-ansible-ipv6-base + nodeset: kolla-ansible-rocky-10-multi-8GB + - job: name: kolla-ansible-ubuntu-noble-ipv6 parent: kolla-ansible-ipv6-base @@ -35,4 +40,5 @@ check: jobs: - kolla-ansible-debian-bookworm-ipv6 + - kolla-ansible-rocky-10-ipv6 - kolla-ansible-ubuntu-noble-ipv6 diff --git a/zuul.d/scenarios/kvm.yaml b/zuul.d/scenarios/kvm.yaml index 829021ad3..a78b927d4 100644 --- a/zuul.d/scenarios/kvm.yaml +++ b/zuul.d/scenarios/kvm.yaml @@ -14,6 +14,11 @@ parent: kolla-ansible-kvm-base nodeset: kolla-ansible-debian-bookworm-nested-virt +- job: + name: kolla-ansible-rocky-10-kvm + parent: kolla-ansible-kvm-base + nodeset: kolla-ansible-rocky-10-8GB + - job: name: kolla-ansible-ubuntu-noble-kvm parent: kolla-ansible-kvm-base @@ -26,4 +31,5 @@ check: jobs: - kolla-ansible-debian-bookworm-kvm + - kolla-ansible-rocky-10-kvm - kolla-ansible-ubuntu-noble-kvm diff --git a/zuul.d/scenarios/magnum.yaml b/zuul.d/scenarios/magnum.yaml index cd19d79a0..fb0e08b2f 100644 --- a/zuul.d/scenarios/magnum.yaml +++ b/zuul.d/scenarios/magnum.yaml @@ -21,6 +21,11 @@ parent: kolla-ansible-magnum-base nodeset: kolla-ansible-debian-bookworm-8GB +- job: + name: kolla-ansible-rocky-10-magnum + parent: kolla-ansible-magnum-base + nodeset: kolla-ansible-rocky-10-8GB + - job: name: kolla-ansible-ubuntu-noble-magnum parent: kolla-ansible-magnum-base @@ -33,4 +38,5 @@ check: jobs: - kolla-ansible-debian-bookworm-magnum + - kolla-ansible-rocky-10-magnum - kolla-ansible-ubuntu-noble-magnum diff --git a/zuul.d/scenarios/mariadb.yaml b/zuul.d/scenarios/mariadb.yaml index 776a9999c..59be95396 100644 --- a/zuul.d/scenarios/mariadb.yaml +++ b/zuul.d/scenarios/mariadb.yaml @@ -22,6 +22,11 @@ parent: kolla-ansible-mariadb-base nodeset: kolla-ansible-debian-bookworm-multi-16GB +- job: + name: kolla-ansible-rocky-10-mariadb + parent: kolla-ansible-mariadb-base + nodeset: kolla-ansible-rocky-10-multi-16GB + - job: name: kolla-ansible-ubuntu-noble-mariadb parent: kolla-ansible-mariadb-base @@ -34,6 +39,7 @@ check: jobs: - kolla-ansible-debian-bookworm-mariadb + - kolla-ansible-rocky-10-mariadb - kolla-ansible-ubuntu-noble-mariadb gate: jobs: diff --git a/zuul.d/scenarios/masakari.yaml b/zuul.d/scenarios/masakari.yaml index ed6182b8b..11a5955c2 100644 --- a/zuul.d/scenarios/masakari.yaml +++ b/zuul.d/scenarios/masakari.yaml @@ -21,6 +21,11 @@ parent: kolla-ansible-masakari-base nodeset: kolla-ansible-debian-bookworm-masakari-8GB +- job: + name: kolla-ansible-rocky-10-masakari + parent: kolla-ansible-masakari-base + nodeset: kolla-ansible-rocky-10-masakari-8GB + - job: name: kolla-ansible-ubuntu-noble-masakari parent: kolla-ansible-masakari-base @@ -33,4 +38,5 @@ check: jobs: - kolla-ansible-debian-bookworm-masakari + - kolla-ansible-rocky-10-masakari - kolla-ansible-ubuntu-noble-masakari diff --git a/zuul.d/scenarios/prometheus-opensearch.yaml b/zuul.d/scenarios/prometheus-opensearch.yaml index 9cd993849..463e54d6d 100644 --- a/zuul.d/scenarios/prometheus-opensearch.yaml +++ b/zuul.d/scenarios/prometheus-opensearch.yaml @@ -33,6 +33,11 @@ parent: kolla-ansible-debian-bookworm-prometheus-opensearch nodeset: kolla-ansible-debian-bookworm-8GB +- job: + name: kolla-ansible-rocky-10-prometheus-opensearch + parent: kolla-ansible-prometheus-opensearch-base + nodeset: kolla-ansible-rocky-10-8GB + - job: name: kolla-ansible-ubuntu-noble-prometheus-opensearch parent: kolla-ansible-prometheus-opensearch-base @@ -51,5 +56,6 @@ jobs: - kolla-ansible-debian-bookworm-prometheus-opensearch - kolla-ansible-debian-bookworm-prometheus-opensearch-upgrade + - kolla-ansible-rocky-10-prometheus-opensearch - kolla-ansible-ubuntu-noble-prometheus-opensearch - kolla-ansible-ubuntu-noble-prometheus-opensearch-upgrade diff --git a/zuul.d/scenarios/skyline.yaml b/zuul.d/scenarios/skyline.yaml index c25bbdd96..6386ad7a6 100644 --- a/zuul.d/scenarios/skyline.yaml +++ b/zuul.d/scenarios/skyline.yaml @@ -29,6 +29,16 @@ parent: kolla-ansible-skyline-sso-base nodeset: kolla-ansible-debian-bookworm-8GB +- job: + name: kolla-ansible-rocky-10-skyline + parent: kolla-ansible-skyline-base + nodeset: kolla-ansible-rocky-10-8GB + +- job: + name: kolla-ansible-rocky-10-skyline-sso + parent: kolla-ansible-skyline-sso-base + nodeset: kolla-ansible-rocky-10-8GB + - job: name: kolla-ansible-ubuntu-noble-skyline parent: kolla-ansible-skyline-base @@ -47,5 +57,7 @@ jobs: - kolla-ansible-debian-bookworm-skyline - kolla-ansible-debian-bookworm-skyline-sso + - kolla-ansible-rocky-10-skyline + - kolla-ansible-rocky-10-skyline-sso - kolla-ansible-ubuntu-noble-skyline - kolla-ansible-ubuntu-noble-skyline-sso diff --git a/zuul.d/scenarios/telemetry.yaml b/zuul.d/scenarios/telemetry.yaml index ec20cd708..e95a41a91 100644 --- a/zuul.d/scenarios/telemetry.yaml +++ b/zuul.d/scenarios/telemetry.yaml @@ -18,6 +18,11 @@ parent: kolla-ansible-telemetry-base nodeset: kolla-ansible-debian-bookworm-8GB +- job: + name: kolla-ansible-rocky-10-telemetry + parent: kolla-ansible-telemetry-base + nodeset: kolla-ansible-rocky-10-8GB + - job: name: kolla-ansible-ubuntu-noble-telemetry parent: kolla-ansible-telemetry-base @@ -30,4 +35,5 @@ check: jobs: - kolla-ansible-debian-bookworm-telemetry + - kolla-ansible-rocky-10-telemetry - kolla-ansible-ubuntu-noble-telemetry -- cgit v1.2.3