From 4a7e5ee0dd0fe3ea31a3e6d59a51fe0ca72bda2c Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Tue, 21 Apr 2026 15:28:38 +0200 Subject: [PATCH 1/3] CI: sync Debian scenario jobs with kolla-ansible Change-Id: I9642861ad1617636e5148434a2440f10dafb7161 Signed-off-by: Bartosz Bezak --- zuul.d/scenarios/aio.yaml | 2 +- zuul.d/scenarios/bifrost.yaml | 2 +- zuul.d/scenarios/cells.yaml | 2 +- zuul.d/scenarios/cephadm.yaml | 2 +- zuul.d/scenarios/ironic.yaml | 2 +- zuul.d/scenarios/mariadb.yaml | 2 +- zuul.d/scenarios/masakari.yaml | 2 +- zuul.d/scenarios/octavia.yaml | 2 +- zuul.d/scenarios/ovn.yaml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/zuul.d/scenarios/aio.yaml b/zuul.d/scenarios/aio.yaml index 392ea7b228..cc896b84df 100644 --- a/zuul.d/scenarios/aio.yaml +++ b/zuul.d/scenarios/aio.yaml @@ -23,7 +23,7 @@ jobs: - kolla-ansible-centos-10s-aarch64: files: ^docker/ - - kolla-ansible-debian-bookworm-aarch64: + - kolla-ansible-debian-trixie-aarch64: files: ^docker/ gate: jobs: diff --git a/zuul.d/scenarios/bifrost.yaml b/zuul.d/scenarios/bifrost.yaml index e72f5b4069..9a507ec17d 100644 --- a/zuul.d/scenarios/bifrost.yaml +++ b/zuul.d/scenarios/bifrost.yaml @@ -5,7 +5,7 @@ Runs Kolla-Ansible Bifrost scenario jobs on particular Kolla changes. check: jobs: - - kolla-ansible-debian-bookworm-bifrost: + - kolla-ansible-debian-trixie-bifrost: files: ^docker/bifrost/ - kolla-ansible-rocky-10-bifrost: files: ^docker/bifrost/ diff --git a/zuul.d/scenarios/cells.yaml b/zuul.d/scenarios/cells.yaml index 474bd3ec64..541d6777f3 100644 --- a/zuul.d/scenarios/cells.yaml +++ b/zuul.d/scenarios/cells.yaml @@ -5,7 +5,7 @@ Runs Kolla-Ansible Nova Cells scenario jobs on particular Kolla changes. check: jobs: - - kolla-ansible-debian-bookworm-cells: + - kolla-ansible-debian-trixie-cells: files: ^docker/proxysql/ - kolla-ansible-rocky-10-cells: files: ^docker/proxysql/ diff --git a/zuul.d/scenarios/cephadm.yaml b/zuul.d/scenarios/cephadm.yaml index c41162ee8d..66f173ff5a 100644 --- a/zuul.d/scenarios/cephadm.yaml +++ b/zuul.d/scenarios/cephadm.yaml @@ -5,7 +5,7 @@ Runs Kolla-Ansible CephAdm scenario jobs on particular Kolla changes. check: jobs: - - kolla-ansible-debian-bookworm-cephadm: + - kolla-ansible-debian-trixie-cephadm: files: ^docker\/(base|cinder|glance|mariadb-server|openstack-base|rabbitmq)\/.* - kolla-ansible-debian-bookworm-cephadm-upgrade: files: ^docker\/(base|cinder|glance|mariadb-server|openstack-base|rabbitmq)\/.* diff --git a/zuul.d/scenarios/ironic.yaml b/zuul.d/scenarios/ironic.yaml index 4c501ad324..0efc92ddd9 100644 --- a/zuul.d/scenarios/ironic.yaml +++ b/zuul.d/scenarios/ironic.yaml @@ -5,7 +5,7 @@ Runs Kolla-Ansible Ironic scenario jobs on particular Kolla changes. check: jobs: - - kolla-ansible-debian-bookworm-ironic: + - kolla-ansible-debian-trixie-ironic: files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.* - kolla-ansible-rocky-10-ironic: files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.* diff --git a/zuul.d/scenarios/mariadb.yaml b/zuul.d/scenarios/mariadb.yaml index f89e8f087e..5905a10577 100644 --- a/zuul.d/scenarios/mariadb.yaml +++ b/zuul.d/scenarios/mariadb.yaml @@ -5,7 +5,7 @@ Runs Kolla-Ansible MariaDB scenario jobs on particular Kolla changes. check: jobs: - - kolla-ansible-debian-bookworm-mariadb: + - kolla-ansible-debian-trixie-mariadb: files: ^docker/(base|mariadb-server)/ - kolla-ansible-rocky-10-mariadb: files: ^docker/(base|mariadb-server)/ diff --git a/zuul.d/scenarios/masakari.yaml b/zuul.d/scenarios/masakari.yaml index 0974a2affc..dc7744853f 100644 --- a/zuul.d/scenarios/masakari.yaml +++ b/zuul.d/scenarios/masakari.yaml @@ -5,7 +5,7 @@ Runs Kolla-Ansible Masakari scenario jobs on particular Kolla changes. check: jobs: - - kolla-ansible-debian-bookworm-masakari: + - kolla-ansible-debian-trixie-masakari: files: ^docker/(base|masakari|openstack-base)/ - kolla-ansible-rocky-10-masakari: files: ^docker/(base|masakari|openstack-base)/ diff --git a/zuul.d/scenarios/octavia.yaml b/zuul.d/scenarios/octavia.yaml index e708090f26..ddfb1e0e8b 100644 --- a/zuul.d/scenarios/octavia.yaml +++ b/zuul.d/scenarios/octavia.yaml @@ -5,7 +5,7 @@ Runs Kolla-Ansible Octavia scenario jobs on particular Kolla changes. check: jobs: - - kolla-ansible-debian-bookworm-octavia: + - kolla-ansible-debian-trixie-octavia: files: ^docker/(base|neutron|octavia|openstack-base|openvswitch|ovn)/ - kolla-ansible-ubuntu-noble-octavia: files: ^docker/(base|neutron|octavia|openstack-base|openvswitch|ovn)/ diff --git a/zuul.d/scenarios/ovn.yaml b/zuul.d/scenarios/ovn.yaml index a531a02b4b..7d92bc60a3 100644 --- a/zuul.d/scenarios/ovn.yaml +++ b/zuul.d/scenarios/ovn.yaml @@ -5,7 +5,7 @@ Runs Kolla-Ansible OVN scenario jobs on particular Kolla changes. check: jobs: - - kolla-ansible-debian-bookworm-ovn: + - kolla-ansible-debian-trixie-ovn: files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/ - kolla-ansible-rocky-10-ovn: files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/ From 4d6770e378085c468ea01b23af222cf6396cd349 Mon Sep 17 00:00:00 2001 From: Doug Szumski Date: Fri, 24 Apr 2026 10:15:22 +0100 Subject: [PATCH 2/3] Add a telemetry scenario Run the Kolla Ansible telemetry scenario when related Docker image files are changed. Change-Id: I93c5b23d8abfae6d5d006b9f8a709676d4e994bd Signed-off-by: Doug Szumski --- zuul.d/project.yaml | 1 + zuul.d/scenarios/telemetry.yaml | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 zuul.d/scenarios/telemetry.yaml diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index f8652aaf73..bc7d588765 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -19,6 +19,7 @@ - kolla-scenario-masakari - kolla-scenario-octavia - kolla-scenario-ovn + - kolla-scenario-telemetry - kolla-tox-genconfig - openstack-python3-jobs - openstack-python3-jobs-arm64 diff --git a/zuul.d/scenarios/telemetry.yaml b/zuul.d/scenarios/telemetry.yaml new file mode 100644 index 0000000000..ef90c34af3 --- /dev/null +++ b/zuul.d/scenarios/telemetry.yaml @@ -0,0 +1,13 @@ +--- +- project-template: + name: kolla-scenario-telemetry + description: | + Runs Kolla-Ansible Telemetry scenario jobs on particular Kolla changes. + check: + jobs: + - kolla-ansible-debian-trixie-telemetry: + files: ^docker\/(base|aodh|ceilometer|gnocchi|valkey|openstack-base)\/.* + - kolla-ansible-rocky-10-telemetry: + files: ^docker\/(base|aodh|ceilometer|gnocchi|valkey|openstack-base)\/.* + - kolla-ansible-ubuntu-noble-telemetry: + files: ^docker\/(base|aodh|ceilometer|gnocchi|valkey|openstack-base)\/.* From 90cfc97e5bea5a4800e46d4af64ca352f561f11c Mon Sep 17 00:00:00 2001 From: Piotr Milewski Date: Tue, 21 Apr 2026 12:43:26 +0200 Subject: [PATCH 3/3] Remove reference to deprecated app.wsgi in Aodh image The app.wsgi entry point has been removed upstream in Aodh 2026.1 (see: https://review.opendev.org/c/openstack/aodh/+/983216) Change-Id: I2738b7844bf852f2a0a1ca903463f92ffc25f4d2 Signed-off-by: Piotr Milewski --- docker/aodh/aodh-base/Dockerfile.j2 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2 index 39e785dc82..7f68c50719 100644 --- a/docker/aodh/aodh-base/Dockerfile.j2 +++ b/docker/aodh/aodh-base/Dockerfile.j2 @@ -13,7 +13,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {{ macros.install_packages(aodh_base_packages | customizable("packages")) }} -RUN mkdir -p /var/www/cgi-bin/aodh ADD aodh-base-archive /aodh-base-source @@ -26,13 +25,11 @@ COPY aodh_sudoers /etc/sudoers.d/kolla_aodh_sudoers RUN ln -s aodh-base-source/* aodh \ && {{ macros.install_pip(aodh_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/aodh /var/www/cgi-bin/aodh \ - && cp /aodh/aodh/api/app.wsgi /var/www/cgi-bin/aodh \ + && mkdir -p /etc/aodh \ && cp /aodh/aodh/api/api-paste.ini /etc/aodh/ \ && chmod 644 /etc/aodh/api-paste.ini \ && chmod 750 /etc/sudoers.d \ && chmod 640 /etc/sudoers.d/kolla_aodh_sudoers \ - && chmod 755 /var/www/cgi-bin/aodh \ && touch /usr/local/bin/kolla_aodh_extend_start \ && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_aodh_extend_start