Use OpenStack image for Brightbox

build_library/vm_image_util.sh

@@ -9,7 +9,6 @@ VALID_IMG_TYPES=(
     ami
     ami_vmdk
     azure
-    brightbox
     cloudsigma
     cloudstack
     cloudstack_vhd
@@ -242,12 +241,6 @@ IMG_openstack_mini_OEM_PACKAGE=common-oem-files
 IMG_openstack_mini_OEM_USE=openstack
 IMG_openstack_mini_OEM_SYSEXT=oem-openstack
 
-## brightbox, supports ec2's metadata format so use oem-ec2-compat
-IMG_brightbox_DISK_FORMAT=qcow2
-IMG_brightbox_DISK_LAYOUT=vm
-IMG_brightbox_OEM_PACKAGE=oem-ec2-compat
-IMG_brightbox_OEM_USE=brightbox
-
 ## pxe, which is an cpio image
 IMG_pxe_DISK_FORMAT=cpio
 IMG_pxe_PARTITIONED_IMG=0

changelog/changes/2023-11-14-brightbox.md

@@ -0,0 +1,2 @@
+- Brightbox: The regular OpenStack image should now be used, it includes Afterburn for instance metadata attributes
+- OpenStack: An uncompressed image is provided for simpler import (since the images use qcow2 inline compression, there is no benefit in using the `.gz` or `.bz2` images)

ci-automation/vms.sh

@@ -127,8 +127,10 @@ function _vm_build_impl() {
     for format in ${formats}; do
         echo " ###################  VENDOR '${format}' ################### "
         COMPRESSION_FORMAT="bz2"
-        if [[ "${format}" =~ ^(openstack|openstack_mini|digitalocean)$ ]];then
+        if [[ "${format}" =~ ^(openstack_mini|digitalocean)$ ]];then
             COMPRESSION_FORMAT="gz,bz2"
+        elif [[ "${format}" =~ ^(openstack)$ ]];then
+            COMPRESSION_FORMAT="gz,bz2,none"
         elif [[ "${format}" =~ ^(qemu|qemu_uefi)$ ]];then
             COMPRESSION_FORMAT="bz2,none"
         fi
@@ -148,6 +150,7 @@ function _vm_build_impl() {
         -v "${vernum}" \
         mv "${CONTAINER_IMAGE_ROOT}/${arch}-usr/" "./${images_out}/"
 
+    ( cd images/latest ; ln -s flatcar_production_openstack_image.img.bz2 flatcar_production_brightbox_image.img.bz2 )
     create_digests "${SIGNER}" "images/latest/"*
     sign_artifacts "${SIGNER}" "images/latest/"*
     copy_to_buildcache "images/${arch}/${vernum}/" "images/latest/"*