Synchronise 2025.1 with upstream

.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

.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

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/ \

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")) }}
 

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")) }}
 

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