Skip to content

Synchronise master with upstream #504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Alex-Welsh merged 2 commits into from
Jan 2, 2026
Merged

Synchronise master with upstream #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4941a22
Revert "kolla-toolbox: Bump ansible-core to 2.20"
mnasiadka Dec 22, 2025
4e37b41
CI: Add ^docker/ trigger for aio jobs
mnasiadka Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/kolla-toolbox/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
5 changes: 0 additions & 5 deletions releasenotes/notes/ansible-core-2-20-bd912e1767d5f197.yaml
View file
Open in desktop

This file was deleted.

45 changes: 30 additions & 15 deletions zuul.d/scenarios/aio.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/