diff options
Diffstat (limited to 'zuul.d')
26 files changed, 192 insertions, 142 deletions
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 7a9b481cb..05bd823d6 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -12,7 +12,9 @@ - openstack/kolla-ansible - openstack/requirements files: + - ^ansible/site.yml - ^ansible/group_vars/all/common.yml + - ^ansible/roles/certificates/ - ^requirements-core.yml - ^roles/kolla-ansible-test-dashboard/ - ^tests/check-(config|failure|logs).sh @@ -49,9 +51,9 @@ ansible_core_version_constraint: >- {{ ansible_core_version_slurp if is_slurp else ansible_core_version_min if is_upgrade or ansible_facts.distribution != "Ubuntu" else ansible_core_version_max }} - ansible_core_version_slurp: "==2.17.*" - ansible_core_version_max: "==2.19.*" - ansible_core_version_min: "==2.18.*" + ansible_core_version_slurp: "==2.18.*" + ansible_core_version_max: "==2.20.*" + ansible_core_version_min: "==2.19.*" # NOTE(mgoddard): Test the use of interface names with dashes. api_interface_name: "vxlan-0" api_network_prefix: "192.0.2." @@ -61,7 +63,8 @@ container_engine: "docker" is_upgrade: "{{ 'upgrade' in zuul.job }}" is_slurp: "{{ 'slurp' in zuul.job }}" - kolla_ansible_tempest_regex: "\\[.*\\bsmoke\\b.*\\]" + kolla_ansible_tempest_regex: + - .*smoke.* kolla_internal_vip_address: "192.0.2.10" le_enabled: false neutron_external_bridge_name: br-0 @@ -73,7 +76,7 @@ neutron_tenant_network_dns_server: "8.8.8.8" neutron_tenant_network_prefix: "203.0.113." neutron_tenant_network_prefix_length: "24" - previous_release: "{{ '2025.1' if is_slurp else '2025.1' }}" + previous_release: "{{ '2025.1' if is_slurp else '2025.2' }}" scenario: core scenario_images_core: - ^cron diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml index 295df62e6..d143e4ae7 100644 --- a/zuul.d/nodesets.yaml +++ b/zuul.d/nodesets.yaml @@ -12,60 +12,60 @@ label: centos-10-stream-arm64-8GB - nodeset: - name: kolla-ansible-debian-bookworm-8GB + name: kolla-ansible-debian-trixie-8GB nodes: - name: primary - label: debian-bookworm-8GB + label: debian-trixie-8GB - nodeset: - name: kolla-ansible-debian-bookworm-16GB + name: kolla-ansible-debian-trixie-16GB nodes: - name: primary - label: debian-bookworm-16GB + label: debian-trixie-16GB - nodeset: - name: kolla-ansible-debian-bookworm-aarch64-8GB + name: kolla-ansible-debian-trixie-aarch64-8GB nodes: - name: primary - label: debian-bookworm-arm64-8GB + label: debian-trixie-arm64-8GB - nodeset: - name: kolla-ansible-debian-bookworm-masakari-8GB + name: kolla-ansible-debian-trixie-masakari-8GB nodes: - name: primary - label: debian-bookworm-8GB + label: debian-trixie-8GB - name: secondary - label: debian-bookworm-8GB + label: debian-trixie-8GB - name: ternary1 - label: debian-bookworm-8GB + label: debian-trixie-8GB - name: ternary2 - label: debian-bookworm-8GB + label: debian-trixie-8GB - nodeset: - name: kolla-ansible-debian-bookworm-multi-8GB + name: kolla-ansible-debian-trixie-multi-8GB nodes: - name: primary - label: debian-bookworm-8GB + label: debian-trixie-8GB - name: secondary1 - label: debian-bookworm-8GB + label: debian-trixie-8GB - name: secondary2 - label: debian-bookworm-8GB + label: debian-trixie-8GB - nodeset: - name: kolla-ansible-debian-bookworm-multi-16GB + name: kolla-ansible-debian-trixie-multi-16GB nodes: - name: primary - label: debian-bookworm-16GB + label: debian-trixie-16GB - name: secondary1 - label: debian-bookworm-16GB + label: debian-trixie-16GB - name: secondary2 - label: debian-bookworm-16GB + label: debian-trixie-16GB - nodeset: - name: kolla-ansible-debian-bookworm-nested-virt + name: kolla-ansible-debian-trixie-nested-virt nodes: - name: primary - label: debian-bookworm-nested-virt-8GB + label: debian-trixie-nested-virt-8GB - nodeset: name: kolla-ansible-rocky-10-8GB diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index cebe4b88c..779021fd7 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -30,6 +30,7 @@ - kolla-ansible-scenario-prometheus-opensearch # NOTE(mnasiadka): SSO and non-SSO tests are failing #- kolla-ansible-scenario-skyline + - kolla-ansible-scenario-slurp - kolla-ansible-scenario-telemetry - openstack-cover-jobs - openstack-python3-jobs-kolla-ansible diff --git a/zuul.d/scenarios/aio.yaml b/zuul.d/scenarios/aio.yaml index 384a06b27..8ac3659b8 100644 --- a/zuul.d/scenarios/aio.yaml +++ b/zuul.d/scenarios/aio.yaml @@ -8,7 +8,7 @@ - ^ansible/(action_plugins|filter_plugins|library|module_utils)/ - ^ansible/roles/(common|fluentd|glance|haproxy-config|heat|horizon|keystone|loadbalancer|loadbalancer-config|neutron|nova|nova-cell|openvswitch|placement|proxysql|rabbitmq|service.*)/ - ^kolla_ansible/ - - ^roles/kolla-ansible-(deploy|tempest|test-dashboard)/ + - ^roles/kolla-ansible-(deploy|tempest|test-dashboard|reconfigure)/ - ^tests/testinfra/test_horizon.py - ^tools/init-runonce @@ -26,23 +26,23 @@ nodeset: kolla-ansible-centos-10s-aarch64-8GB - job: - name: kolla-ansible-debian-bookworm + name: kolla-ansible-debian-trixie parent: kolla-ansible-aio-base - nodeset: kolla-ansible-debian-bookworm-16GB + nodeset: kolla-ansible-debian-trixie-16GB - job: - name: kolla-ansible-debian-bookworm-aarch64 - parent: kolla-ansible-debian-bookworm - nodeset: kolla-ansible-debian-bookworm-aarch64-8GB + name: kolla-ansible-debian-trixie-aarch64 + parent: kolla-ansible-debian-trixie + nodeset: kolla-ansible-debian-trixie-aarch64-8GB timeout: 10800 vars: kolla_build_images: true voting: false - job: - name: kolla-ansible-debian-bookworm-aarch64-podman - parent: kolla-ansible-debian-bookworm-aarch64 - nodeset: kolla-ansible-debian-bookworm-aarch64-8GB + name: kolla-ansible-debian-trixie-aarch64-podman + parent: kolla-ansible-debian-trixie-aarch64 + nodeset: kolla-ansible-debian-trixie-aarch64-8GB timeout: 10800 vars: container_engine: podman @@ -50,9 +50,9 @@ voting: false - job: - name: kolla-ansible-debian-bookworm-podman - parent: kolla-ansible-debian-bookworm - nodeset: kolla-ansible-debian-bookworm-16GB + name: kolla-ansible-debian-trixie-podman + parent: kolla-ansible-debian-trixie + nodeset: kolla-ansible-debian-trixie-16GB vars: container_engine: podman @@ -72,7 +72,7 @@ name: kolla-ansible-debian-bookworm-upgrade-slurp parent: kolla-ansible-debian-bookworm-upgrade nodeset: kolla-ansible-debian-bookworm-16GB - timeout: 9000 + timeout: 10800 - job: name: kolla-ansible-rocky-10 @@ -80,6 +80,18 @@ nodeset: kolla-ansible-rocky-10-16GB - job: + name: kolla-ansible-rocky-10-upgrade + parent: kolla-ansible-aio-base + nodeset: kolla-ansible-rocky-10-16GB + timeout: 10800 + +- job: + name: kolla-ansible-rocky-10-upgrade-slurp + parent: kolla-ansible-rocky-10-upgrade + nodeset: kolla-ansible-rocky-10-16GB + timeout: 10800 + +- job: name: kolla-ansible-rocky-10-podman parent: kolla-ansible-rocky-10 nodeset: kolla-ansible-rocky-10-16GB @@ -108,7 +120,7 @@ name: kolla-ansible-ubuntu-noble-upgrade-slurp parent: kolla-ansible-aio-base nodeset: kolla-ansible-ubuntu-noble-16GB - timeout: 9000 + timeout: 10800 - project-template: name: kolla-ansible-scenario-aio @@ -117,10 +129,11 @@ check: jobs: - kolla-ansible-centos-10s - - kolla-ansible-debian-bookworm - - kolla-ansible-debian-bookworm-podman + - kolla-ansible-debian-trixie + - kolla-ansible-debian-trixie-podman - kolla-ansible-debian-bookworm-upgrade - kolla-ansible-rocky-10 + - kolla-ansible-rocky-10-upgrade - kolla-ansible-rocky-10-podman - kolla-ansible-ubuntu-noble - kolla-ansible-ubuntu-noble-podman @@ -128,15 +141,16 @@ check-arm64: jobs: - kolla-ansible-centos-10s-aarch64 - - kolla-ansible-debian-bookworm-aarch64 - - kolla-ansible-debian-bookworm-aarch64-podman + - kolla-ansible-debian-trixie-aarch64 + - kolla-ansible-debian-trixie-aarch64-podman - kolla-ansible-debian-bookworm-aarch64-upgrade gate: jobs: - - kolla-ansible-debian-bookworm - - kolla-ansible-debian-bookworm-podman - kolla-ansible-debian-bookworm-upgrade + - kolla-ansible-debian-trixie + - kolla-ansible-debian-trixie-podman - kolla-ansible-rocky-10 + - kolla-ansible-rocky-10-upgrade - kolla-ansible-rocky-10-podman - kolla-ansible-ubuntu-noble - kolla-ansible-ubuntu-noble-upgrade diff --git a/zuul.d/scenarios/bifrost.yaml b/zuul.d/scenarios/bifrost.yaml index 958c5a69c..c2d01aaed 100644 --- a/zuul.d/scenarios/bifrost.yaml +++ b/zuul.d/scenarios/bifrost.yaml @@ -13,9 +13,9 @@ - ^bifrost - job: - name: kolla-ansible-debian-bookworm-bifrost + name: kolla-ansible-debian-trixie-bifrost parent: kolla-ansible-bifrost-base - nodeset: kolla-ansible-debian-bookworm-8GB + nodeset: kolla-ansible-debian-trixie-8GB - job: name: kolla-ansible-rocky-10-bifrost @@ -33,6 +33,6 @@ Runs Kolla-Ansible Bifrost scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-bifrost + - kolla-ansible-debian-trixie-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 b94bbe93a..97897b45f 100644 --- a/zuul.d/scenarios/cells.yaml +++ b/zuul.d/scenarios/cells.yaml @@ -15,9 +15,9 @@ - ^proxysql - job: - name: kolla-ansible-debian-bookworm-cells + name: kolla-ansible-debian-trixie-cells parent: kolla-ansible-cells-base - nodeset: kolla-ansible-debian-bookworm-multi-16GB + nodeset: kolla-ansible-debian-trixie-multi-16GB - job: name: kolla-ansible-rocky-10-cells @@ -35,6 +35,6 @@ Runs Kolla-Ansible Nova Cells scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-cells + - kolla-ansible-debian-trixie-cells - kolla-ansible-rocky-10-cells - kolla-ansible-ubuntu-noble-cells diff --git a/zuul.d/scenarios/cephadm.yaml b/zuul.d/scenarios/cephadm.yaml index 2120af30e..1502b3052 100644 --- a/zuul.d/scenarios/cephadm.yaml +++ b/zuul.d/scenarios/cephadm.yaml @@ -6,35 +6,40 @@ files: - ^ansible/group_vars/all/(ceph|ceph-rgw|common|fluentd|glance|heat|horizon|keepalived|keystone|loadbalancer|neutron|nova|openvswitch|placement|proxysql|rabbitmq|valkey).yml - ^ansible/group_vars/baremetal/ansible-python-interpreter.yml - - ^ansible/roles/(ceph-rgw|common|fluentd|glance|haproxy-config|heat|horizon|keystone|loadbalancer|loadbalancer-config|neutron|nova|openvswitch|placement|proxysql|rabbitmq|valkey)/ + - ^ansible/roles/(ceph-rgw|certificates|common|fluentd|glance|haproxy-config|heat|horizon|keystone|loadbalancer|loadbalancer-config|neutron|nova|openvswitch|placement|proxysql|rabbitmq|valkey)/ - ^roles/cephadm/ vars: kolla_ansible_setup_disks_file_path: "/var/lib/ceph-osd.img" kolla_ansible_setup_disks_vg_name: "cephvg" kolla_ansible_setup_disks_lv_name: "cephlv" - kolla_ansible_tempest_exclude_regex: "^tempest.api.object_storage" + kolla_ansible_tempest_exclude_regex: + - ^tempest.api.object_storage scenario: cephadm scenario_images_extra: - ^cinder - ^valkey - job: - name: kolla-ansible-debian-bookworm-cephadm + name: kolla-ansible-debian-trixie-cephadm parent: kolla-ansible-cephadm-base - nodeset: kolla-ansible-debian-bookworm-multi-16GB + nodeset: kolla-ansible-debian-trixie-multi-16GB timeout: 10800 + vars: + cephadm_use_package_from_distribution: true - job: - name: kolla-ansible-debian-bookworm-cephadm-upgrade - parent: kolla-ansible-debian-bookworm-cephadm - nodeset: kolla-ansible-debian-bookworm-multi-16GB + name: kolla-ansible-rocky-10-cephadm + parent: kolla-ansible-cephadm-base + nodeset: kolla-ansible-rocky-10-multi-16GB timeout: 10800 + vars: + cephadm_use_package_from_distribution: true - job: - name: kolla-ansible-debian-bookworm-cephadm-upgrade-slurp - parent: kolla-ansible-debian-bookworm-cephadm-upgrade - nodeset: kolla-ansible-debian-bookworm-multi-16GB - timeout: 9000 + name: kolla-ansible-rocky-10-cephadm-upgrade + parent: kolla-ansible-rocky-10-cephadm + nodeset: kolla-ansible-rocky-10-multi-16GB + timeout: 10800 - job: name: kolla-ansible-ubuntu-noble-cephadm @@ -54,7 +59,7 @@ name: kolla-ansible-ubuntu-noble-cephadm-upgrade-slurp parent: kolla-ansible-ubuntu-noble-cephadm-upgrade nodeset: kolla-ansible-ubuntu-noble-multi-16GB - timeout: 9000 + timeout: 10800 - project-template: name: kolla-ansible-scenario-cephadm @@ -62,7 +67,9 @@ Runs Kolla-Ansible CephAdm scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-cephadm - kolla-ansible-debian-bookworm-cephadm-upgrade + - kolla-ansible-debian-trixie-cephadm + - kolla-ansible-rocky-10-cephadm + - kolla-ansible-rocky-10-cephadm-upgrade - kolla-ansible-ubuntu-noble-cephadm - kolla-ansible-ubuntu-noble-cephadm-upgrade diff --git a/zuul.d/scenarios/container-engine-migration.yaml b/zuul.d/scenarios/container-engine-migration.yaml index c57aaa23a..31bf4c1ec 100644 --- a/zuul.d/scenarios/container-engine-migration.yaml +++ b/zuul.d/scenarios/container-engine-migration.yaml @@ -13,12 +13,12 @@ - job: name: kolla-ansible-debian-container-engine-migration parent: kolla-ansible-container-engine-migration-base - nodeset: kolla-ansible-debian-bookworm-16GB + nodeset: kolla-ansible-debian-trixie-16GB - job: name: kolla-ansible-debian-container-engine-migration-multinode parent: kolla-ansible-container-engine-migration-base - nodeset: kolla-ansible-debian-bookworm-multi-16GB + nodeset: kolla-ansible-debian-trixie-multi-16GB - job: name: kolla-ansible-ubuntu-container-engine-migration diff --git a/zuul.d/scenarios/haproxy-fqdn.yaml b/zuul.d/scenarios/haproxy-fqdn.yaml index 51ecfcdc0..7a32335e8 100644 --- a/zuul.d/scenarios/haproxy-fqdn.yaml +++ b/zuul.d/scenarios/haproxy-fqdn.yaml @@ -15,9 +15,9 @@ scenario: haproxy - job: - name: kolla-ansible-debian-bookworm-haproxy-fqdn + name: kolla-ansible-debian-trixie-haproxy-fqdn parent: kolla-ansible-haproxy-fqdn-base - nodeset: kolla-ansible-debian-bookworm-8GB + nodeset: kolla-ansible-debian-trixie-8GB - job: name: kolla-ansible-rocky-10-haproxy-fqdn @@ -35,6 +35,6 @@ Runs Kolla-Ansible HAProxy FQDN scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-haproxy-fqdn + - kolla-ansible-debian-trixie-haproxy-fqdn - kolla-ansible-rocky-10-haproxy-fqdn - kolla-ansible-ubuntu-noble-haproxy-fqdn diff --git a/zuul.d/scenarios/ipv6.yaml b/zuul.d/scenarios/ipv6.yaml index f465b966a..582d6484f 100644 --- a/zuul.d/scenarios/ipv6.yaml +++ b/zuul.d/scenarios/ipv6.yaml @@ -19,9 +19,9 @@ tls_enabled: false - job: - name: kolla-ansible-debian-bookworm-ipv6 + name: kolla-ansible-debian-trixie-ipv6 parent: kolla-ansible-ipv6-base - nodeset: kolla-ansible-debian-bookworm-multi-8GB + nodeset: kolla-ansible-debian-trixie-multi-8GB - job: name: kolla-ansible-rocky-10-ipv6 @@ -39,6 +39,6 @@ Runs Kolla-Ansible ipv6 scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-ipv6 + - kolla-ansible-debian-trixie-ipv6 - kolla-ansible-rocky-10-ipv6 - kolla-ansible-ubuntu-noble-ipv6 diff --git a/zuul.d/scenarios/ironic.yaml b/zuul.d/scenarios/ironic.yaml index ee2000557..9cc37d53b 100644 --- a/zuul.d/scenarios/ironic.yaml +++ b/zuul.d/scenarios/ironic.yaml @@ -23,14 +23,9 @@ tls_enabled: false - job: - name: kolla-ansible-debian-bookworm-ironic + name: kolla-ansible-debian-trixie-ironic parent: kolla-ansible-ironic-base - nodeset: kolla-ansible-debian-bookworm-16GB - -- job: - name: kolla-ansible-debian-bookworm-ironic-upgrade - parent: kolla-ansible-debian-bookworm-ironic - nodeset: kolla-ansible-debian-bookworm-16GB + nodeset: kolla-ansible-debian-trixie-16GB - job: name: kolla-ansible-rocky-10-ironic @@ -38,6 +33,11 @@ nodeset: kolla-ansible-rocky-10-16GB - job: + name: kolla-ansible-rocky-10-ironic-upgrade + parent: kolla-ansible-rocky-10-ironic + nodeset: kolla-ansible-rocky-10-16GB + +- job: name: kolla-ansible-ubuntu-noble-ironic parent: kolla-ansible-ironic-base nodeset: kolla-ansible-ubuntu-noble-16GB @@ -53,8 +53,9 @@ Runs Kolla-Ansible Ironic scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-ironic - kolla-ansible-debian-bookworm-ironic-upgrade + - kolla-ansible-debian-trixie-ironic - kolla-ansible-rocky-10-ironic + - kolla-ansible-rocky-10-ironic-upgrade - kolla-ansible-ubuntu-noble-ironic - kolla-ansible-ubuntu-noble-ironic-upgrade diff --git a/zuul.d/scenarios/keystone-federation.yaml b/zuul.d/scenarios/keystone-federation.yaml index 47e3f3ff8..2f43e15ef 100644 --- a/zuul.d/scenarios/keystone-federation.yaml +++ b/zuul.d/scenarios/keystone-federation.yaml @@ -12,9 +12,9 @@ - ^httpd - job: - name: kolla-ansible-debian-bookworm-federation + name: kolla-ansible-debian-trixie-federation parent: kolla-ansible-federation-base - nodeset: kolla-ansible-debian-bookworm-multi-8GB + nodeset: kolla-ansible-debian-trixie-multi-8GB - job: name: kolla-ansible-rocky-10-federation @@ -32,6 +32,6 @@ Runs Kolla-Ansible Keystone federation scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-federation + - kolla-ansible-debian-trixie-federation - kolla-ansible-rocky-10-federation - kolla-ansible-ubuntu-noble-federation diff --git a/zuul.d/scenarios/kvm.yaml b/zuul.d/scenarios/kvm.yaml index ed7d3219c..c83683eae 100644 --- a/zuul.d/scenarios/kvm.yaml +++ b/zuul.d/scenarios/kvm.yaml @@ -10,9 +10,9 @@ virt_type: kvm - job: - name: kolla-ansible-debian-bookworm-kvm + name: kolla-ansible-debian-trixie-kvm parent: kolla-ansible-kvm-base - nodeset: kolla-ansible-debian-bookworm-nested-virt + nodeset: kolla-ansible-debian-trixie-nested-virt - job: name: kolla-ansible-rocky-10-kvm @@ -30,6 +30,6 @@ Runs Kolla-Ansible KVM scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-kvm + - kolla-ansible-debian-trixie-kvm - kolla-ansible-rocky-10-kvm - kolla-ansible-ubuntu-noble-kvm diff --git a/zuul.d/scenarios/lets-encrypt.yaml b/zuul.d/scenarios/lets-encrypt.yaml index fc059a79c..92fa2b78d 100644 --- a/zuul.d/scenarios/lets-encrypt.yaml +++ b/zuul.d/scenarios/lets-encrypt.yaml @@ -19,9 +19,9 @@ le_enabled: true - job: - name: kolla-ansible-debian-bookworm-lets-encrypt + name: kolla-ansible-debian-trixie-lets-encrypt parent: kolla-ansible-lets-encrypt-base - nodeset: kolla-ansible-debian-bookworm-multi-16GB + nodeset: kolla-ansible-debian-trixie-multi-16GB - job: name: kolla-ansible-ubuntu-noble-lets-encrypt @@ -34,5 +34,5 @@ Runs Kolla-Ansible Let's Encrypt scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-lets-encrypt + - kolla-ansible-debian-trixie-lets-encrypt - kolla-ansible-ubuntu-noble-lets-encrypt diff --git a/zuul.d/scenarios/magnum.yaml b/zuul.d/scenarios/magnum.yaml index 9a5552150..d3a031973 100644 --- a/zuul.d/scenarios/magnum.yaml +++ b/zuul.d/scenarios/magnum.yaml @@ -18,9 +18,9 @@ tls_enabled: false - job: - name: kolla-ansible-debian-bookworm-magnum + name: kolla-ansible-debian-trixie-magnum parent: kolla-ansible-magnum-base - nodeset: kolla-ansible-debian-bookworm-8GB + nodeset: kolla-ansible-debian-trixie-8GB - job: name: kolla-ansible-rocky-10-magnum @@ -38,6 +38,6 @@ Runs Kolla-Ansible Magnum scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-magnum + - kolla-ansible-debian-trixie-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 3e540e93a..d82bddaf4 100644 --- a/zuul.d/scenarios/mariadb.yaml +++ b/zuul.d/scenarios/mariadb.yaml @@ -19,16 +19,14 @@ - ^proxysql - job: - name: kolla-ansible-debian-bookworm-mariadb + name: kolla-ansible-debian-trixie-mariadb parent: kolla-ansible-mariadb-base - nodeset: kolla-ansible-debian-bookworm-multi-16GB + nodeset: kolla-ansible-debian-trixie-multi-16GB - job: name: kolla-ansible-debian-bookworm-mariadb-upgrade parent: kolla-ansible-mariadb-base nodeset: kolla-ansible-debian-bookworm-multi-16GB - vars: - is_upgrade: true - job: name: kolla-ansible-rocky-10-mariadb @@ -36,6 +34,11 @@ nodeset: kolla-ansible-rocky-10-multi-16GB - job: + name: kolla-ansible-rocky-10-mariadb-upgrade + parent: kolla-ansible-mariadb-base + nodeset: kolla-ansible-rocky-10-multi-16GB + +- job: name: kolla-ansible-ubuntu-noble-mariadb parent: kolla-ansible-mariadb-base nodeset: kolla-ansible-ubuntu-noble-multi-8GB @@ -44,8 +47,6 @@ name: kolla-ansible-ubuntu-noble-mariadb-upgrade parent: kolla-ansible-mariadb-base nodeset: kolla-ansible-ubuntu-noble-multi-8GB - vars: - is_upgrade: true - project-template: name: kolla-ansible-scenario-mariadb @@ -53,15 +54,17 @@ Runs Kolla-Ansible MariaDB scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-mariadb + - kolla-ansible-debian-trixie-mariadb - kolla-ansible-debian-bookworm-mariadb-upgrade - kolla-ansible-rocky-10-mariadb + - kolla-ansible-rocky-10-mariadb-upgrade - kolla-ansible-ubuntu-noble-mariadb - kolla-ansible-ubuntu-noble-mariadb-upgrade gate: jobs: - - kolla-ansible-debian-bookworm-mariadb + - kolla-ansible-debian-trixie-mariadb - kolla-ansible-debian-bookworm-mariadb-upgrade - kolla-ansible-rocky-10-mariadb + - kolla-ansible-rocky-10-mariadb-upgrade - kolla-ansible-ubuntu-noble-mariadb - kolla-ansible-ubuntu-noble-mariadb-upgrade diff --git a/zuul.d/scenarios/masakari.yaml b/zuul.d/scenarios/masakari.yaml index 02eb2a98e..1a1169d22 100644 --- a/zuul.d/scenarios/masakari.yaml +++ b/zuul.d/scenarios/masakari.yaml @@ -17,9 +17,9 @@ tls_enabled: false - job: - name: kolla-ansible-debian-bookworm-masakari + name: kolla-ansible-debian-trixie-masakari parent: kolla-ansible-masakari-base - nodeset: kolla-ansible-debian-bookworm-masakari-8GB + nodeset: kolla-ansible-debian-trixie-masakari-8GB - job: name: kolla-ansible-rocky-10-masakari @@ -37,6 +37,6 @@ Runs Kolla-Ansible Masakari scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-masakari + - kolla-ansible-debian-trixie-masakari - kolla-ansible-rocky-10-masakari - kolla-ansible-ubuntu-noble-masakari diff --git a/zuul.d/scenarios/nfv.yaml b/zuul.d/scenarios/nfv.yaml index 03df813c0..f5594a427 100644 --- a/zuul.d/scenarios/nfv.yaml +++ b/zuul.d/scenarios/nfv.yaml @@ -18,9 +18,9 @@ tls_enabled: false - job: - name: kolla-ansible-debian-bookworm-nfv + name: kolla-ansible-debian-trixie-nfv parent: kolla-ansible-scenario-nfv-base - nodeset: kolla-ansible-debian-bookworm-multi-8GB + nodeset: kolla-ansible-debian-trixie-multi-8GB - job: name: kolla-ansible-ubuntu-noble-nfv @@ -33,5 +33,5 @@ Runs Kolla-Ansible NFV scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-nfv + - kolla-ansible-debian-trixie-nfv - kolla-ansible-ubuntu-noble-nfv diff --git a/zuul.d/scenarios/octavia.yaml b/zuul.d/scenarios/octavia.yaml index 520969f65..5625e63cf 100644 --- a/zuul.d/scenarios/octavia.yaml +++ b/zuul.d/scenarios/octavia.yaml @@ -15,9 +15,9 @@ tls_enabled: false - job: - name: kolla-ansible-debian-bookworm-octavia + name: kolla-ansible-debian-trixie-octavia parent: kolla-ansible-octavia-base - nodeset: kolla-ansible-debian-bookworm-16GB + nodeset: kolla-ansible-debian-trixie-16GB - job: name: kolla-ansible-ubuntu-noble-octavia @@ -30,5 +30,5 @@ Runs Kolla-Ansible Octavia scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-octavia + - kolla-ansible-debian-trixie-octavia - kolla-ansible-ubuntu-noble-octavia diff --git a/zuul.d/scenarios/openbao.yaml b/zuul.d/scenarios/openbao.yaml index 1cca53ec3..c7ef9659b 100644 --- a/zuul.d/scenarios/openbao.yaml +++ b/zuul.d/scenarios/openbao.yaml @@ -15,9 +15,9 @@ - ^tests/test-openbao-passwords.sh - job: - name: kolla-ansible-debian-bookworm-openbao + name: kolla-ansible-debian-trixie-openbao parent: kolla-ansible-openbao-base - nodeset: kolla-ansible-debian-bookworm-8GB + nodeset: kolla-ansible-debian-trixie-8GB - job: name: kolla-ansible-rocky-10-openbao @@ -35,6 +35,6 @@ Runs Kolla-Ansible OpenBao scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-openbao + - kolla-ansible-debian-trixie-openbao - kolla-ansible-rocky-10-openbao - kolla-ansible-ubuntu-noble-openbao diff --git a/zuul.d/scenarios/ovn.yaml b/zuul.d/scenarios/ovn.yaml index cfc4b2926..618c6b524 100644 --- a/zuul.d/scenarios/ovn.yaml +++ b/zuul.d/scenarios/ovn.yaml @@ -6,6 +6,7 @@ - ^ansible/group_vars/all/(neutron|octavia|openvswitch|ovn).yml - ^ansible/roles/(neutron|octavia|openvswitch|ovn-controller|ovn-db)/ - ^tests/test-ovn.sh + voting: false vars: scenario: ovn scenario_images_extra: @@ -13,9 +14,9 @@ - ^ovn - job: - name: kolla-ansible-debian-bookworm-ovn + name: kolla-ansible-debian-trixie-ovn parent: kolla-ansible-ovn-base - nodeset: kolla-ansible-debian-bookworm-multi-16GB + nodeset: kolla-ansible-debian-trixie-multi-16GB # NOTE(mnasiadka): Often cirros boot is crashing on cannot open root device voting: false @@ -26,6 +27,17 @@ timeout: 10800 - job: + name: kolla-ansible-rocky-10-ovn + parent: kolla-ansible-ovn-base + nodeset: kolla-ansible-rocky-10-multi-16GB + +- job: + name: kolla-ansible-rocky-10-ovn-upgrade + parent: kolla-ansible-rocky-10-ovn + nodeset: kolla-ansible-rocky-10-multi-16GB + timeout: 10800 + +- job: name: kolla-ansible-ubuntu-noble-ovn parent: kolla-ansible-ovn-base nodeset: kolla-ansible-ubuntu-noble-multi-16GB @@ -42,11 +54,9 @@ Runs Kolla-Ansible OVN scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-ovn + - kolla-ansible-debian-trixie-ovn - kolla-ansible-debian-bookworm-ovn-upgrade - - kolla-ansible-ubuntu-noble-ovn - - kolla-ansible-ubuntu-noble-ovn-upgrade - gate: - jobs: + - kolla-ansible-rocky-10-ovn + - kolla-ansible-rocky-10-ovn-upgrade - kolla-ansible-ubuntu-noble-ovn - kolla-ansible-ubuntu-noble-ovn-upgrade diff --git a/zuul.d/scenarios/prometheus-opensearch.yaml b/zuul.d/scenarios/prometheus-opensearch.yaml index f17d34f7d..fb8c6c445 100644 --- a/zuul.d/scenarios/prometheus-opensearch.yaml +++ b/zuul.d/scenarios/prometheus-opensearch.yaml @@ -24,14 +24,9 @@ - ^rabbitmq - job: - name: kolla-ansible-debian-bookworm-prometheus-opensearch + name: kolla-ansible-debian-trixie-prometheus-opensearch parent: kolla-ansible-prometheus-opensearch-base - nodeset: kolla-ansible-debian-bookworm-8GB - -- job: - name: kolla-ansible-debian-bookworm-prometheus-opensearch-upgrade - parent: kolla-ansible-debian-bookworm-prometheus-opensearch - nodeset: kolla-ansible-debian-bookworm-8GB + nodeset: kolla-ansible-debian-trixie-8GB - job: name: kolla-ansible-rocky-10-prometheus-opensearch @@ -39,6 +34,11 @@ nodeset: kolla-ansible-rocky-10-8GB - job: + name: kolla-ansible-rocky-10-prometheus-opensearch-upgrade + parent: kolla-ansible-rocky-10-prometheus-opensearch + nodeset: kolla-ansible-rocky-10-8GB + +- job: name: kolla-ansible-ubuntu-noble-prometheus-opensearch parent: kolla-ansible-prometheus-opensearch-base nodeset: kolla-ansible-ubuntu-noble-8GB @@ -54,8 +54,9 @@ Runs Kolla-Ansible Prometheus OpenSearch scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-prometheus-opensearch - kolla-ansible-debian-bookworm-prometheus-opensearch-upgrade + - kolla-ansible-debian-trixie-prometheus-opensearch - kolla-ansible-rocky-10-prometheus-opensearch + - kolla-ansible-rocky-10-prometheus-opensearch-upgrade - 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 5ff97810b..e3c0c4c79 100644 --- a/zuul.d/scenarios/skyline.yaml +++ b/zuul.d/scenarios/skyline.yaml @@ -21,14 +21,14 @@ scenario: skyline-sso - job: - name: kolla-ansible-debian-bookworm-skyline + name: kolla-ansible-debian-trixie-skyline parent: kolla-ansible-skyline-base - nodeset: kolla-ansible-debian-bookworm-8GB + nodeset: kolla-ansible-debian-trixie-8GB - job: - name: kolla-ansible-debian-bookworm-skyline-sso + name: kolla-ansible-debian-trixie-skyline-sso parent: kolla-ansible-skyline-sso-base - nodeset: kolla-ansible-debian-bookworm-8GB + nodeset: kolla-ansible-debian-trixie-8GB - job: name: kolla-ansible-rocky-10-skyline @@ -56,8 +56,8 @@ Runs Kolla-Ansible Skyline scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-skyline - - kolla-ansible-debian-bookworm-skyline-sso + - kolla-ansible-debian-trixie-skyline + - kolla-ansible-debian-trixie-skyline-sso - kolla-ansible-rocky-10-skyline - kolla-ansible-rocky-10-skyline-sso - kolla-ansible-ubuntu-noble-skyline diff --git a/zuul.d/scenarios/slurp.yaml b/zuul.d/scenarios/slurp.yaml new file mode 100644 index 000000000..3251abadf --- /dev/null +++ b/zuul.d/scenarios/slurp.yaml @@ -0,0 +1,10 @@ +--- +- project-template: + name: kolla-ansible-scenario-slurp + description: | + Runs Kolla-Ansible SLURP upgrade scenario jobs. + check: + jobs: + - kolla-ansible-rocky-10-upgrade-slurp + - kolla-ansible-ubuntu-noble-upgrade-slurp + - kolla-ansible-ubuntu-noble-cephadm-upgrade-slurp diff --git a/zuul.d/scenarios/telemetry.yaml b/zuul.d/scenarios/telemetry.yaml index bd762ea4c..878966b52 100644 --- a/zuul.d/scenarios/telemetry.yaml +++ b/zuul.d/scenarios/telemetry.yaml @@ -16,9 +16,9 @@ - ^valkey - job: - name: kolla-ansible-debian-bookworm-telemetry + name: kolla-ansible-debian-trixie-telemetry parent: kolla-ansible-telemetry-base - nodeset: kolla-ansible-debian-bookworm-8GB + nodeset: kolla-ansible-debian-trixie-8GB - job: name: kolla-ansible-rocky-10-telemetry @@ -36,6 +36,6 @@ Runs Kolla-Ansible Telemetry scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-telemetry + - kolla-ansible-debian-trixie-telemetry - kolla-ansible-rocky-10-telemetry - kolla-ansible-ubuntu-noble-telemetry diff --git a/zuul.d/scenarios/zun.yaml b/zuul.d/scenarios/zun.yaml index 25397725d..ea5e96a52 100644 --- a/zuul.d/scenarios/zun.yaml +++ b/zuul.d/scenarios/zun.yaml @@ -23,12 +23,12 @@ - ^tgtd - job: - name: kolla-ansible-debian-zun + name: kolla-ansible-debian-trixie-zun parent: kolla-ansible-zun-base - nodeset: kolla-ansible-debian-bookworm-multi-8GB + nodeset: kolla-ansible-debian-trixie-multi-8GB - job: - name: kolla-ansible-ubuntu-zun + name: kolla-ansible-ubuntu-noble-zun parent: kolla-ansible-zun-base nodeset: kolla-ansible-ubuntu-noble-multi-8GB @@ -38,5 +38,5 @@ Runs Kolla-Ansible Zun scenario jobs. check: jobs: - - kolla-ansible-debian-zun - - kolla-ansible-ubuntu-zun + - kolla-ansible-debian-trixie-zun + - kolla-ansible-ubuntu-noble-zun |