diff --git a/hack/ci/cloud-init/controller.yaml.tpl b/hack/ci/cloud-init/controller.yaml.tpl index 174bf04154..b34e62b4ce 100644 --- a/hack/ci/cloud-init/controller.yaml.tpl +++ b/hack/ci/cloud-init/controller.yaml.tpl @@ -81,6 +81,12 @@ # query_placement_for_availability_zone is the default from Xena query_placement_for_availability_zone = True + [workarounds] + # FIXME(stephenfin): This is temporary while we get to the bottom of + # https://bugs.launchpad.net/nova/+bug/2091114 It should not be kept after + # we bump to 2025.1 + disable_deep_image_inspection = True + [[post-config|$CINDER_CONF]] [DEFAULT] storage_availability_zone = ${PRIMARY_AZ} diff --git a/hack/ci/cloud-init/worker.yaml.tpl b/hack/ci/cloud-init/worker.yaml.tpl index ccbf79411d..6e4a5b44e6 100644 --- a/hack/ci/cloud-init/worker.yaml.tpl +++ b/hack/ci/cloud-init/worker.yaml.tpl @@ -47,6 +47,12 @@ [DEFAULT] cpu_allocation_ratio = 2.0 + [workarounds] + # FIXME(stephenfin): This is temporary while we get to the bottom of + # https://bugs.launchpad.net/nova/+bug/2091114 It should not be kept after + # we bump to 2025.1 + disable_deep_image_inspection = True + [[post-config|$CINDER_CONF]] [DEFAULT] storage_availability_zone = ${SECONDARY_AZ} diff --git a/hack/ci/create_devstack.sh b/hack/ci/create_devstack.sh index 3c4f6e1794..60c8ce7f62 100755 --- a/hack/ci/create_devstack.sh +++ b/hack/ci/create_devstack.sh @@ -31,7 +31,7 @@ source "${scriptdir}/${RESOURCE_TYPE}.sh" CLUSTER_NAME=${CLUSTER_NAME:-"capo-e2e"} -OPENSTACK_RELEASE=${OPENSTACK_RELEASE:-"2024.1"} +OPENSTACK_RELEASE=${OPENSTACK_RELEASE:-"2024.2"} OPENSTACK_ENABLE_HORIZON=${OPENSTACK_ENABLE_HORIZON:-"false"} # Devstack will create a provider network using this range diff --git a/hack/ci/gce-project.sh b/hack/ci/gce-project.sh index 1aae2de9b9..c915f40ce0 100755 --- a/hack/ci/gce-project.sh +++ b/hack/ci/gce-project.sh @@ -95,7 +95,7 @@ function create_vm { --zone "$GCP_ZONE" \ --enable-nested-virtualization \ --image-project ubuntu-os-cloud \ - --image-family ubuntu-2204-lts \ + --image-family ubuntu-2404-lts-amd64 \ --boot-disk-size 200G \ --boot-disk-type pd-ssd \ --can-ip-forward \ diff --git a/hack/ci/libvirt.sh b/hack/ci/libvirt.sh index 4dc70b29a9..d6b8d1ab64 100755 --- a/hack/ci/libvirt.sh +++ b/hack/ci/libvirt.sh @@ -25,7 +25,7 @@ set -x -o errexit -o nounset -o pipefail function cloud_init { LIBVIRT_NETWORK_NAME=${LIBVIRT_NETWORK_NAME:-${CLUSTER_NAME}-network} - LIBVIRT_IMAGE_NAME=${LIBVIRT_IMAGE_NAME:-ubuntu-2204-lts} + LIBVIRT_IMAGE_NAME=${LIBVIRT_IMAGE_NAME:-ubuntu-2404-lts} LIBVIRT_MEMORY=${LIBVIRT_MEMORY:-8192} LIBVIRT_MEMORY_controller=${LIBVIRT_MEMORY_controller:-$LIBVIRT_MEMORY} @@ -65,7 +65,7 @@ EOF fi if [ ! -f "/tmp/${LIBVIRT_IMAGE_NAME}.qcow2" ]; then - curl -o "/tmp/${LIBVIRT_IMAGE_NAME}.qcow2" https://cloud-images.ubuntu.com/releases/jammy/release/ubuntu-22.04-server-cloudimg-amd64.img + curl -o "/tmp/${LIBVIRT_IMAGE_NAME}.qcow2" https://cloud-images.ubuntu.com/releases/noble/release/ubuntu-24.04-server-cloudimg-amd64.img fi }