Synchronise master with upstream

doc/source/contributor/testenv.rst

@@ -64,15 +64,6 @@ To install Bifrost services inside the testenv:
 
 Additionally, the following parameters can be useful:
 
-``--develop``
-    Install services in develop mode, so that the changes to the repositories
-    in ``/opt`` get immediately reflected in the virtual environment.
-
-    .. note::
-       You still need to restart services to apply any changes, e.g.::
-
-        sudo systemctl restart ironic
-
 ``--driver=[ipmi|redfish]``
     Choose the default driver for the generated nodes inventory.
 
@@ -88,6 +79,11 @@ Additionally, the following parameters can be useful:
 Activate the testenv and utilize the baremetal CLI in no-auth
 mode with clouds.yaml:
 
+    .. note::
+       You still need to restart services to apply any changes, e.g.::
+
+        sudo systemctl restart ironic
+
 .. code-block:: bash
 
    source /opt/stack/bifrost/bin/activate

zuul.d/project.yaml

@@ -23,6 +23,7 @@
         - bifrost-integration-inspector-centos-10
         - bifrost-integration-inspector-ubuntu-jammy
         - bifrost-upgrade-ubuntu-jammy
+        - bifrost-upgrade-keystone-centos-10
         - bifrost-upgrade-keystone-ubuntu-noble
         # Non-voting jobs
         - bifrost-slurp-upgrade-ubuntu-jammy:
@@ -33,10 +34,6 @@
             voting: false
         - bifrost-integration-dibipa-debian-ubuntu-jammy:
             voting: false
-        # TODO(priteau): Can be made voting by backporting
-        # https://review.opendev.org/c/openstack/bifrost/+/958853
-        - bifrost-upgrade-keystone-centos-10:
-            voting: false
         - bifrost-cli-ubuntu-jammy:
             voting: false
         - bifrost-collections-src:
@@ -82,6 +79,7 @@
         - bifrost-integration-inspector-centos-10
         - bifrost-integration-inspector-ubuntu-jammy
         - bifrost-upgrade-ubuntu-jammy
+        - bifrost-upgrade-keystone-centos-10
         - bifrost-upgrade-keystone-ubuntu-noble
     experimental:
       jobs: