Merge pull request #190 from stackhpc/upstream/master-2026-05-04

Synchronise master with upstream

Author: priteau

.zuul.d/cross-jobs.yaml

@@ -13,7 +13,7 @@
       .. zuul:jobvar:: tox_envlist
 
          Use the specified tox environments (``ALL`` selects all).
-    nodeset: ubuntu-noble
+    nodeset: debian-trixie-8GB
     vars:
       zuul_work_dir: "{{ (zuul.projects.values() | selectattr('required') | selectattr('name', 'match', '^(?!openstack/requirements)') | list)[0].src_dir }}"
       tox_constraints_file: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt"
@@ -22,68 +22,68 @@
       - .zuul.d/cross-jobs.yaml
 
 - job:
-    name: cross-aodh-py312
+    name: cross-aodh-py313
     parent: requirements-cross-test
-    description: Run cross-project tests on aodh with py312.
+    description: Run cross-project tests on aodh with py313.
     required-projects: openstack/aodh
     vars:
-      tox_envlist: py312
+      tox_envlist: py313
 
 - job:
-    name: cross-barbican-py312
+    name: cross-barbican-py313
     parent: requirements-cross-test
-    description: Run cross-project tests on barbican with py312.
+    description: Run cross-project tests on barbican with py313.
     required-projects: openstack/barbican
     vars:
-      tox_envlist: py312
+      tox_envlist: py313
 
 - job:
-    name: cross-ceilometer-py312
+    name: cross-ceilometer-py313
     parent: requirements-cross-test
-    description: Run cross-project tests on ceilometer with py312.
+    description: Run cross-project tests on ceilometer with py313.
     required-projects: openstack/ceilometer
     vars:
-      tox_envlist: py312
+      tox_envlist: py313
 
 - job:
-    name: cross-cinder-py312
+    name: cross-cinder-py313
     parent: requirements-cross-test
-    description: Run cross-project tests on cinder with py312.
+    description: Run cross-project tests on cinder with py313.
     required-projects: openstack/cinder
     vars:
-      tox_envlist: py312
+      tox_envlist: py313
 
 - job:
-    name: cross-designate-py312
+    name: cross-designate-py313
     parent: requirements-cross-test
-    description: Run cross-project tests on designate with py312.
+    description: Run cross-project tests on designate with py313.
     required-projects: openstack/designate
     vars:
-      tox_envlist: py312
+      tox_envlist: py313
 
 - job:
-    name: cross-glance-py312
+    name: cross-glance-py313
     parent: requirements-cross-test
-    description: Run cross-project tests on glance with py312.
+    description: Run cross-project tests on glance with py313.
     required-projects: openstack/glance
     vars:
-      tox_envlist: py312
+      tox_envlist: py313
 
 - job:
-    name: cross-heat-py312
+    name: cross-heat-py313
     parent: requirements-cross-test
-    description: Run cross-project tests on heat with py312.
+    description: Run cross-project tests on heat with py313.
     required-projects: openstack/heat
     vars:
-      tox_envlist: py312
+      tox_envlist: py313
 
 - job:
-    name: cross-horizon-py312
+    name: cross-horizon-py313
     parent: requirements-cross-test
-    description: Run cross-project tests on horizon with py312.
+    description: Run cross-project tests on horizon with py313.
     required-projects: openstack/horizon
     vars:
-      tox_envlist: py312
+      tox_envlist: py313
 
 - job:
     name: cross-horizon-npm
@@ -101,70 +101,70 @@
       - .zuul.d/cross-jobs.yaml
 
 - job:
-    name: cross-keystone-py312
+    name: cross-keystone-py313
     parent: requirements-cross-test
-    description: Run cross-project tests on keystone with py312.
+    description: Run cross-project tests on keystone with py313.
     required-projects: openstack/keystone
     timeout: 3600
     vars:
-      tox_envlist: py312
+      tox_envlist: py313
 
 - job:
-    name: cross-kuryr-py312
+    name: cross-kuryr-py313
     parent: requirements-cross-test
-    description: Run cross-project tests on kuryr-kubernetes with py312.
+    description: Run cross-project tests on kuryr-kubernetes with py313.
     required-projects: openstack/kuryr-kubernetes
     vars:
-      tox_envlist: py312
+      tox_envlist: py313
 
 - job:
-    name: cross-ironic-py312
+    name: cross-ironic-py313
     parent: requirements-cross-test
-    description: Run cross-project tests on ironic with py312.
+    description: Run cross-project tests on ironic with py313.
     required-projects: openstack/ironic
     vars:
-      tox_envlist: py312
+      tox_envlist: py313
 
 - job:
-    name: cross-magnum-py312
+    name: cross-magnum-py313
     parent: requirements-cross-test
-    description: Run cross-project tests on magnum with py312.
+    description: Run cross-project tests on magnum with py313.
     required-projects: openstack/magnum
     vars:
-      tox_envlist: py312
+      tox_envlist: py313
 
 - job:
-    name: cross-manila-py312
+    name: cross-manila-py313
     parent: requirements-cross-test
-    description: Run cross-project tests on manila with py312.
+    description: Run cross-project tests on manila with py313.
     required-projects: openstack/manila
     vars:
-      tox_envlist: py312
+      tox_envlist: py313
 
 - job:
-    name: cross-masakari-py312
+    name: cross-masakari-py313
     parent: requirements-cross-test
-    description: Run cross-project tests on masakari with py312.
+    description: Run cross-project tests on masakari with py313.
     required-projects: openstack/masakari
     vars:
-      tox_envlist: py312
+      tox_envlist: py313
 
 - job:
-    name: cross-mistral-py312
+    name: cross-mistral-py313
     parent: requirements-cross-test
-    description: Run cross-project tests on mistral with py312.
+    description: Run cross-project tests on mistral with py313.
     required-projects: openstack/mistral
     vars:
-      tox_envlist: py312
+      tox_envlist: py313
 
 - job:
-    name: cross-neutron-py312
+    name: cross-neutron-py313
     parent: requirements-cross-test
-    description: Run cross-project tests on neutron with py312.
+    description: Run cross-project tests on neutron with py313.
     required-projects: openstack/neutron
     timeout: 3600
     vars:
-      tox_envlist: py312
+      tox_envlist: py313
 
 - job:
     name: cross-nova-functional
@@ -175,12 +175,12 @@
       tox_envlist: functional
 
 - job:
-    name: cross-placement-functional-py312
+    name: cross-placement-functional-py313
     parent: requirements-cross-test
-    description: Run cross-project functional tests on placement with py312.
+    description: Run cross-project functional tests on placement with py313.
     required-projects: openstack/placement
     vars:
-      tox_envlist: functional-py312
+      tox_envlist: functional-py313
 
 - job:
     name: cross-nova-pep8
@@ -191,20 +191,20 @@
       tox_envlist: pep8
 
 - job:
-    name: cross-nova-py312
+    name: cross-nova-py313
     parent: requirements-cross-test
-    description: Run cross-project tests on nova with py312.
+    description: Run cross-project tests on nova with py313.
     required-projects: openstack/nova
     vars:
-      tox_envlist: py312
+      tox_envlist: py313
 
 - job:
-    name: cross-placement-py312
+    name: cross-placement-py313
     parent: requirements-cross-test
-    description: Run cross-project tests on placement with py312.
+    description: Run cross-project tests on placement with py313.
     required-projects: openstack/placement
     vars:
-      tox_envlist: py312
+      tox_envlist: py313
 
 - job:
     name: cross-osvif-py3
@@ -215,20 +215,20 @@
       tox_envlist: py3
 
 - job:
-    name: cross-octavia-py312
+    name: cross-octavia-py313
     parent: requirements-cross-test
-    description: Run cross-project tests on octavia with py312.
+    description: Run cross-project tests on octavia with py313.
     required-projects: openstack/octavia
     vars:
-      tox_envlist: py312
+      tox_envlist: py313
 
 - job:
-    name: cross-swift-py312
+    name: cross-swift-py313
     parent: requirements-cross-test
-    description: Run cross-project tests on swift with py312.
+    description: Run cross-project tests on swift with py313.
     required-projects: openstack/swift
     vars:
-      tox_envlist: py312
+      tox_envlist: py313
 
 - job:
     name: cross-osc-tox-docs

.zuul.d/project.yaml

@@ -20,34 +20,34 @@
         - requirements-tox-py313-check-uc
         - requirements-tox-validate-projects:
             voting: false
-        - cross-aodh-py312
-        - cross-barbican-py312
-        - cross-ceilometer-py312
-        - cross-cinder-py312
-        - cross-designate-py312
-        - cross-glance-py312
-        - cross-heat-py312
-        - cross-horizon-py312
+        - cross-aodh-py313
+        - cross-barbican-py313
+        - cross-ceilometer-py313
+        - cross-cinder-py313
+        - cross-designate-py313
+        - cross-glance-py313
+        - cross-heat-py313
+        - cross-horizon-py313
         - cross-horizon-npm
-        - cross-ironic-py312
-        - cross-keystone-py312
-        - cross-kuryr-py312
-        - cross-manila-py312
-        - cross-magnum-py312
-        - cross-masakari-py312:
+        - cross-ironic-py313
+        - cross-keystone-py313
+        - cross-kuryr-py313
+        - cross-manila-py313
+        - cross-magnum-py313
+        - cross-masakari-py313:
             voting: false
-        - cross-mistral-py312:
+        - cross-mistral-py313:
             voting: false
-        - cross-neutron-py312
+        - cross-neutron-py313
         - cross-nova-pep8
-        - cross-nova-py312
-        - cross-placement-py312
+        - cross-nova-py313
+        - cross-placement-py313
         - cross-osvif-py3
         - cross-nova-functional
-        - cross-placement-functional-py312
-        - cross-octavia-py312
+        - cross-placement-functional-py313
+        - cross-octavia-py313
         - cross-osc-tox-docs
-        - cross-swift-py312
+        - cross-swift-py313
         - cross-watcher-py3
         - openstacksdk-functional-devstack
         - tempest-full-py3:
@@ -78,28 +78,28 @@
         - requirements-tox-py311-check-uc
         - requirements-tox-py312-check-uc
         - requirements-tox-py313-check-uc
-        - cross-cinder-py312
-        - cross-designate-py312
-        - cross-glance-py312
-        - cross-heat-py312
-        - cross-horizon-py312
+        - cross-cinder-py313
+        - cross-designate-py313
+        - cross-glance-py313
+        - cross-heat-py313
+        - cross-horizon-py313
         - cross-horizon-npm
-        - cross-ironic-py312
-        - cross-keystone-py312
-        - cross-kuryr-py312
-        - cross-manila-py312
-        - cross-neutron-py312
+        - cross-ironic-py313
+        - cross-keystone-py313
+        - cross-kuryr-py313
+        - cross-manila-py313
+        - cross-neutron-py313
         - cross-nova-pep8
-        - cross-nova-py312:
+        - cross-nova-py313:
             files: ^upper-constraints.txt$
-        - cross-placement-py312:
+        - cross-placement-py313:
             files: ^upper-constraints.txt$
         - cross-osvif-py3
         - cross-nova-functional
-        - cross-placement-functional-py312
-        - cross-octavia-py312
+        - cross-placement-functional-py313
+        - cross-octavia-py313
         - cross-osc-tox-docs
-        - cross-swift-py312
+        - cross-swift-py313
         - cross-watcher-py3
         - openstacksdk-functional-devstack
         - tempest-full-py3:

global-requirements.txt

@@ -135,7 +135,7 @@ pyOpenSSL  # Apache-2.0
 pyparsing  # MIT
 pyroute2!=0.5.4,!=0.5.5,!=0.7.1,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4;sys_platform!='win32'  # Apache-2.0 (+ dual licensed GPL2)
 pysaml2!=4.0.3,!=4.0.4,!=4.0.5rc1,!=4.0.5,!=4.1.0,!=4.2.0,!=4.3.0,!=4.4.0,!=4.6.0  # Apache-2.0
-pysnmp-lextudio  # BSD
+pysnmp  # BSD
 pystache  # MIT
 # Only required for sasl/binary protocol
 python-binary-memcached  # MIT
@@ -289,6 +289,7 @@ pydotplus  # MIT License
 Pygments  # BSD license
 rst2txt  # BSD
 sphinx!=1.6.6,!=1.6.7,!=2.1.0,!=3.0.0,!=3.4.2  # BSD
+sphinx-copybutton  # MIT
 sphinxcontrib-actdiag  # BSD
 sphinxcontrib-apidoc  # BSD
 sphinxcontrib-blockdiag  # BSD
@@ -483,11 +484,6 @@ jsonpath-rw  # Apache-2.0
 jsonpath-rw-ext  # Apache-2.0
 python-consul  # MIT License
 python-consul2  # MIT License
-# pysnmp library is not maintained since 4 years, it is
-# not recommended to use it, use its fork pysnmp-lextudio instead
-# in conjunction with its dependencies pyasn1-lextudio and
-# pyasn1-modules-lextudio
-pysnmp  # BSD
 simplejson  # MIT
 six  # MIT
 zake  # Apache-2.0