From 4941a22e9790510e4cf90157225c8b087a133c4b Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 22 Dec 2025 12:13:03 +0000 Subject: [PATCH 1/2] Revert "kolla-toolbox: Bump ansible-core to 2.20" This reverts commit ef12d96731bc82472941c81ac24e3a13736674d0. Reason for revert: Broke community.mysql Change-Id: Icb85112c66645d8df00eb0c40076a6bd822f6866 Signed-off-by: Michal Nasiadka --- docker/kolla-toolbox/Dockerfile.j2 | 2 +- releasenotes/notes/ansible-core-2-20-bd912e1767d5f197.yaml | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 releasenotes/notes/ansible-core-2-20-bd912e1767d5f197.yaml diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 6a0796bfbe..9f97ed3866 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -96,7 +96,7 @@ RUN mkdir -p /requirements \ ENV PATH {{ venv_path }}/bin:$PATH {% set kolla_toolbox_pip_packages = [ - 'ansible-core==2.20.*', + 'ansible-core==2.19.*', 'cmd2', 'influxdb', 'openstacksdk', diff --git a/releasenotes/notes/ansible-core-2-20-bd912e1767d5f197.yaml b/releasenotes/notes/ansible-core-2-20-bd912e1767d5f197.yaml deleted file mode 100644 index bf7ac0e7d7..0000000000 --- a/releasenotes/notes/ansible-core-2-20-bd912e1767d5f197.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -features: - - | - Version of ``ansible-core`` in ``kolla-toolbox`` has been updated to - ``2.20``. From 4e37b41022f11ec7d8d0d475f0ba66aad0278376 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 22 Dec 2025 10:59:02 +0100 Subject: [PATCH 2/2] CI: Add ^docker/ trigger for aio jobs Without that - these are not run at all Update Bookworm to Trixie while we're at it Change-Id: I6fb70da636514b5c1057c16cc2df08b07820bc5f Signed-off-by: Michal Nasiadka --- zuul.d/scenarios/aio.yaml | 45 ++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/zuul.d/scenarios/aio.yaml b/zuul.d/scenarios/aio.yaml index 6b38b95d1c..392ea7b228 100644 --- a/zuul.d/scenarios/aio.yaml +++ b/zuul.d/scenarios/aio.yaml @@ -5,22 +5,37 @@ Runs Kolla-Ansible AIO jobs on all Kolla changes. check: jobs: - - kolla-ansible-centos-10s - - kolla-ansible-debian-bookworm - - kolla-ansible-debian-bookworm-upgrade - - kolla-ansible-rocky-10 - - kolla-ansible-rocky-10-upgrade - - kolla-ansible-ubuntu-noble - - kolla-ansible-ubuntu-noble-upgrade + - kolla-ansible-centos-10s: + files: ^docker/ + - kolla-ansible-debian-trixie: + files: ^docker/ + - kolla-ansible-debian-bookworm-upgrade: + files: ^docker/ + - kolla-ansible-rocky-10: + files: ^docker/ + - kolla-ansible-rocky-10-upgrade: + files: ^docker/ + - kolla-ansible-ubuntu-noble: + files: ^docker/ + - kolla-ansible-ubuntu-noble-upgrade: + files: ^docker/ check-arm64: jobs: - - kolla-ansible-centos-10s-aarch64 - - kolla-ansible-debian-bookworm-aarch64 + - kolla-ansible-centos-10s-aarch64: + files: ^docker/ + - kolla-ansible-debian-bookworm-aarch64: + files: ^docker/ gate: jobs: - - kolla-ansible-debian-bookworm - - kolla-ansible-debian-bookworm-upgrade - - kolla-ansible-rocky-10 - - kolla-ansible-rocky-10-upgrade - - kolla-ansible-ubuntu-noble - - kolla-ansible-ubuntu-noble-upgrade + - kolla-ansible-debian-trixie: + files: ^docker/ + - kolla-ansible-debian-bookworm-upgrade: + files: ^docker/ + - kolla-ansible-rocky-10: + files: ^docker/ + - kolla-ansible-rocky-10-upgrade: + files: ^docker/ + - kolla-ansible-ubuntu-noble: + files: ^docker/ + - kolla-ansible-ubuntu-noble-upgrade: + files: ^docker/