Merge pull request #49 from stackhpc/upstream/2024.1-2025-02-03

Synchronise 2024.1 with upstream

zuul.d/bifrost-jobs.yaml

@@ -209,7 +209,7 @@
     run: playbooks/ci/upgrade.yaml
     timeout: 9600
     vars:
-      upgrade_from: stable/2023.1
+      upgrade_from: stable/2023.2
       skip_upgrade:
         - openstack/diskimage-builder
 
@@ -228,17 +228,6 @@
       enable_keystone: true
       noauth_mode: false
 
-- job:
-    name: bifrost-slurp-upgrade
-    parent: bifrost-upgrade
-    vars:
-      upgrade_from: stable/2023.1
-
-- job:
-    name: bifrost-slurp-upgrade-ubuntu-jammy
-    parent: bifrost-slurp-upgrade
-    nodeset: ubuntu-jammy
-
 # NOTE(TheJulia): This job is for use on the ironic repository,
 # to provide a minimal platform where we can execute a job where
 # basic performance numbers will be referenced/collected.

zuul.d/project.yaml

@@ -21,8 +21,6 @@
         - bifrost-upgrade-ubuntu-jammy
         - bifrost-upgrade-keystone-centos9
         # Non-voting jobs
-        - bifrost-slurp-upgrade-ubuntu-jammy:
-            voting: false
         - bifrost-integration-redfish-pxe-uefi-centos-9:
             voting: false
         - bifrost-integration-dhcp-ubuntu-jammy: