Merge pull request #184 from stackhpc/upstream/2025.1-2026-04-20

Synchronise 2025.1 with upstream

Author: mnasiadka

.zuul.d/project.yaml

@@ -3,9 +3,6 @@
       - openstack-python3-jobs
     check:
       jobs:
-        - build-wheel-cache-ubuntu-bionic:
-            files:
-              - bindep.txt
         - build-wheel-cache-ubuntu-focal:
             files:
               - bindep.txt
@@ -69,9 +66,6 @@
               - bindep.txt
     gate:
       jobs:
-        - build-wheel-cache-ubuntu-bionic:
-            files:
-              - bindep.txt
         - build-wheel-cache-ubuntu-focal:
             files:
               - bindep.txt
@@ -92,7 +86,7 @@
         - cross-horizon-py312
         - cross-horizon-npm
         - cross-ironic-py312
-        - cross-keystone-py312
+        # - cross-keystone-py312
         - cross-kuryr-py312
         - cross-manila-py312
         - cross-neutron-py312
@@ -105,7 +99,7 @@
         - cross-nova-functional
         - cross-placement-functional-py312
         - cross-octavia-py312
-        - cross-osc-tox-docs
+        # - cross-osc-tox-docs
         - cross-swift-py312
         - openstacksdk-functional-devstack
         - tempest-full-py3:

tox.ini

@@ -2,6 +2,12 @@
 minversion = 4.11.0
 envlist = validate,py3,pep8,pip-install
 ignore_basepython_conflict=true
+# NOTE(elod.illes): latest virtualenv bundles setuptools 82.0.0, which
+# dropped pkg_resources module source from the package, which is used
+# in xstatic-objectpath, thus virtualenv needs to be pinned to fix the
+# requirements-tox-py3XX-check-uc jobs
+requires =
+    virtualenv<20.37.0
 
 [testenv]
 basepython = python3

upper-constraints.txt

@@ -119,7 +119,7 @@ jaraco.classes===3.4.0
 debtcollector===3.0.0
 responses===0.25.6
 croniter===6.0.0
-horizon===25.3.1
+horizon===25.3.2
 octavia-lib===3.8.0
 python-watcherclient===4.8.0
 MarkupSafe===3.0.2
@@ -354,7 +354,7 @@ infi.dtypes.iqn===0.4.0
 XStatic-tv4===1.2.7.0
 XStatic-JSEncrypt===2.3.1.1
 python-cinderclient===9.7.0
-keystonemiddleware===10.9.0
+keystonemiddleware===10.9.1
 django-formtools===2.5.1
 XStatic-Spin===1.2.5.3
 rich===13.9.4