From 05b6647f13cabb87b3aca1370396142acc5f65c7 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Thu, 12 Feb 2026 11:57:44 +0000 Subject: [PATCH 1/4] [2025.1] Constrain setuptools This fixes various issues relating to pkg_resources being removed [1]. The requirements check has been disabled as it forbids the upper constraint on the setuptools package. [1] https://setuptools.pypa.io/en/stable/history.html#v82-0-0 Depends-On; https://review.opendev.org/c/openstack/requirements/+/976259 Change-Id: I8ef2783ec71c19982c91c2a4806b51c7280452d3 Signed-off-by: Will Szumski --- .zuul.d/project.yaml | 3 ++- requirements.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index a93a1ef017..bea51a32b3 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -1,7 +1,8 @@ --- - project: templates: - - check-requirements + # FIXME(wszumski): Re-enable when setuptools pin is removed. + # - check-requirements - openstack-python3-jobs - openstack-python3-jobs-arm64 - openstack-cover-jobs diff --git a/requirements.txt b/requirements.txt index 49aa8e1f34..672621acea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 Jinja2>=3.0.1 # BSD License (3 clause) GitPython>=1.0.1 # BSD License (3 clause) oslo.config>=5.1.0 # Apache-2.0 -setuptools>=64.0.0 # PSF/ZPL +setuptools>=64.0.0,<82 # PSF/ZPL From 132df17f5138e97f6e1e0cfd97775a97e6feeed1 Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Mon, 2 Mar 2026 16:33:44 +0100 Subject: [PATCH 2/4] [2025.1] heat: pin setuptools below 82 Heat and related deps require pkg_resources. [1] [1] https://setuptools.pypa.io/en/stable/history.html#v82-0-0 Change-Id: I72fd2ba68c9380170aefafd1a9929d535181796d Signed-off-by: Bartosz Bezak --- docker/heat/heat-base/Dockerfile.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2 index 59d6aabb86..2f4ec1f826 100644 --- a/docker/heat/heat-base/Dockerfile.j2 +++ b/docker/heat/heat-base/Dockerfile.j2 @@ -23,7 +23,11 @@ ADD heat-base-archive /heat-base-source COPY extend_start.sh /usr/local/bin/kolla_extend_start +# NOTE(bbezak): pin setuptools to 81.x. +# Heat and related deps require pkg_resources. +# https://setuptools.pypa.io/en/stable/history.html#v82-0-0 RUN ln -s heat-base-source/* heat \ + && {{ macros.install_pip(['setuptools==81.*']) }} \ && {{ macros.install_pip(heat_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/heat \ && cp -r /heat/etc/heat/* /etc/heat/ \ From 7130543722bedc1a621800fb09ced1f69485d310 Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Tue, 3 Mar 2026 12:00:13 +0100 Subject: [PATCH 3/4] [2025.1] CI: enable k-a rocky10 Change-Id: I225ef043f05eda76941e9aeba65bbbb3a154df4d Signed-off-by: Bartosz Bezak --- .zuul.d/rocky.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.zuul.d/rocky.yaml b/.zuul.d/rocky.yaml index bf9a4718a2..fc01807d87 100644 --- a/.zuul.d/rocky.yaml +++ b/.zuul.d/rocky.yaml @@ -33,7 +33,7 @@ files: ^docker/bifrost/ - kolla-build-rocky10 - kolla-build-rocky10-podman - #- kolla-ansible-rocky10 + - kolla-ansible-rocky10 check-arm64: jobs: - kolla-build-rocky9-aarch64 @@ -46,7 +46,7 @@ - kolla-ansible-rocky9-upgrade - kolla-build-rocky10 - kolla-build-rocky10-podman - #- kolla-ansible-rocky10 + - kolla-ansible-rocky10 periodic-stable: jobs: - kolla-publish-rocky9-quay From 7b4dddce681980af06d67d54d900d56e72ea4937 Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Mon, 3 Nov 2025 11:43:59 +0100 Subject: [PATCH 4/4] debian: use valkey from bookworm-backports To fix arm64 valkey build. The virtual `valkey` resolves to `valkey-server` in bookworm-backports, but our global -1000 pin blocks it. Amd64 worked only because extrepo shipped it. Use valkey directly from the backports packages instead. follow up to https://review.opendev.org/c/openstack/kolla/+/932174 Change-Id: I846e4f19696ca28758cb9c0400be96c01b079daa Signed-off-by: Bartosz Bezak (cherry picked from commit 477f71b6ba8dd9472ecccd16ac9a5aa79d82eaf0) --- docker/valkey/valkey-sentinel/Dockerfile.j2 | 6 +++++- docker/valkey/valkey-server/Dockerfile.j2 | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docker/valkey/valkey-sentinel/Dockerfile.j2 b/docker/valkey/valkey-sentinel/Dockerfile.j2 index 9cdfac282f..e3045d2fe9 100644 --- a/docker/valkey/valkey-sentinel/Dockerfile.j2 +++ b/docker/valkey/valkey-sentinel/Dockerfile.j2 @@ -11,7 +11,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.enable_extra_repos(['epel']) }} {% set valkey_sentinel_packages = ['valkey'] %} {% elif base_package_type == 'deb' %} - {% set valkey_sentinel_packages = ['valkey-sentinel'] %} + {% if base_distro == 'debian' %} + {% set valkey_sentinel_packages = ['valkey-sentinel/bookworm-backports'] %} + {% else %} + {% set valkey_sentinel_packages = ['valkey-sentinel'] %} + {% endif %} {% endif %} {{ macros.install_packages(valkey_sentinel_packages | customizable("packages")) }} diff --git a/docker/valkey/valkey-server/Dockerfile.j2 b/docker/valkey/valkey-server/Dockerfile.j2 index 046260d7bf..7b989f66b4 100644 --- a/docker/valkey/valkey-server/Dockerfile.j2 +++ b/docker/valkey/valkey-server/Dockerfile.j2 @@ -11,7 +11,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.enable_extra_repos(['epel']) }} {% set valkey_server_packages = ['valkey'] %} {% elif base_package_type == 'deb' %} - {% set valkey_server_packages = ['valkey'] %} + {% if base_distro == 'debian' %} + {% set valkey_server_packages = ['valkey/bookworm-backports'] %} + {% else %} + {% set valkey_server_packages = ['valkey'] %} + {% endif %} {% endif %} {{ macros.install_packages(valkey_server_packages | customizable("packages")) }}