Synchronise 2025.1 with upstream

.zuul.yaml

@@ -1,54 +1,3 @@
-- secret:
-    name: magnum_docker_login
-    data:
-      user: !encrypted/pkcs1-oaep
-        - jlvqCncV1yJNdDNydFdpAXM06vfvjRcgkgLyJyEY8X5MHOmf6VKL2RiR9nmZX4faDgGHr
-          797eFqJMOrWGc2iQGPmb2AwVkWSpMii3o/pV13jdIJBZ0RJ5g7kUXl8+anY27ZikwgmEM
-          ftad6SESr/PEv1G+35S/YEDveEDqY/6mXWOiO75N2QRrTsmgI9t2ItCS/sylWg+6wam0X
-          rpZHC7MyzMoLwi+ySDwjPDiQCskcwYxRwfwFcp2EPgc3cRx2V+YA1Y0Kaf42wCfSIswVC
-          YhljX2Zp9qWD/WULf3sH4pewfvWEwVojbNYOC99Jh/65i2Csynif7yoAAquY1qiPkXLRf
-          Plstz4UTpBsmx/6HSLAxaKp2gaxedrpeIM4+7lMldCQ+8Yx9ZbxXccINpDFznokHiaK60
-          EbjqQwNyjDeoOOO/gYytOZ8DZBFvxFHkQaiAZdS+icxSKzbl+7dZoqyET95LDnk4aIw9L
-          5fxIHHfpipvDrt3NGVmOaQiA9tBC5eCtCFlpJkJWFaz2ip7sqP8JlkZfWf2kr5ujK7s4B
-          VkiUuxIOBIIhc56XbgRoaFT8z23C357k7rNBDyFu6TPItx5OYXEtWU9hqJazl55EKbcfh
-          N7/a+zHNohrG4bLwjlwQ94AWBGkOxEbeZ2+ndK0SdhXTCtCCnu/0Xtxv3D8uSQ=
-      password: !encrypted/pkcs1-oaep
-        - uk0eQa5ozoUAM5Wc8qQeOjCxmGC/c74iq8EaMGTYtgpYm+teMR9CR0QcrSQA0g+1ZQnbD
-          kIRA/7/N1e6zp59GRrJe9y5Vs9cEvbzKrsRQgkubrYx6XpUVJxxuc5IbrFkiaCfrQkB0E
-          hIQ3RcTFVW6PBoldNGPHk3czvr0oFZbLmRZ44aOolTURFG5DUzFt5HUO4xXwTwCIxxJbO
-          Ch/cYVMzGZaRAi41j7F07b/48Ywg3TkZqy0aAvb/wmFdmlLDR0GlDJy1MdKnmmHNzvywF
-          bE1b4ljhSxhdeHxb5GDelHp+DLLxLAva65DcMQI58JMZiXo7THG49Ho+Msbr+2JCjSUKT
-          qJhH2ht7c6id/VRoPdFGRJbRPCYPraGe6IQs7FWfK0ELvEY8X3g5SSylYCGhr6TdcDFWm
-          nyRiMTuWG7n5j7V4fGnEhyqATNKV4zq5IDs08XxB0od24R346mkE75qzhnnKOi1tdfvPd
-          F443NmZCBRqxwmrUaPLFzzXD+O0xW3qAWxHOzlMGU/VnR4uRdOcyWbCdcO+N392jTiRMX
-          UbRYBPi1hBrBmd9/UjYVVaXESXkZEe81yDFwCR77eGQVVNSZljBJy+VErUv7+RgwTuN/z
-          CtGD6IpE16AHl3i31/1f00t5/t857qzVbdMLJBU8ivKbLPwGAjHMwM0f+y4Ogc=
-
-- job:
-    name: magnum-container-build
-    pre-run: playbooks/container-builder-setup-gate.yaml
-    run: playbooks/container-builder.yaml
-    post-run: playbooks/container-builder-copy-logs.yaml
-    roles:
-      - zuul: openstack/openstack-zuul-jobs
-    timeout: 3600
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^api-ref/.*$
-      - ^doc/.*$
-      - ^specs/.*$
-      - ^install-guide/.*$
-      - ^releasenotes/.*$
-      - ^magnum/.*$
-
-- job:
-    name: magnum-container-publish
-    parent: magnum-container-build
-    post-run: playbooks/container-publish.yaml
-    secrets:
-      - magnum_docker_login
-    timeout: 7200
-
 - job:
     name: magnum-tempest-plugin-tests-cluster-k8s_fcos_v1-1.28
     parent: magnum-tempest-plugin-tests-cluster-k8s_fcos_v1
@@ -147,15 +96,13 @@
         - magnum-tempest-plugin-tests-api-jammy
         - magnum-tempest-plugin-tests-cluster-k8s_fcos_v1-1.27-flannel:
             voting: false
-        - magnum-tempest-plugin-tests-cluster-k8s_fcos_v1-1.27-calico
+        - magnum-tempest-plugin-tests-cluster-k8s_fcos_v1-1.27-calico:
+            voting: false
         - magnum-tempest-plugin-tests-cluster-k8s_fcos_v1-1.28-flannel:
             voting: false
-        - magnum-tempest-plugin-tests-cluster-k8s_fcos_v1-1.28-calico
-        - magnum-container-build
+        - magnum-tempest-plugin-tests-cluster-k8s_fcos_v1-1.28-calico:
+            voting: false
     gate:
       jobs:
         - magnum-tempest-plugin-tests-api
         - magnum-tempest-plugin-tests-api-jammy
-    post:
-      jobs:
-        - magnum-container-publish

tox.ini

@@ -77,6 +77,7 @@ commands = {toxinidir}/tools/cover.sh {posargs}
 
 [testenv:docs]
 deps =
+  setuptools==81.0.0
   -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.1}
   -r{toxinidir}/doc/requirements.txt
 commands =