Skip to content

build_library: fix Exoscale image format, size, and compression #4075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jheidel wants to merge 1 commit into
base: main
Choose a base branch
from
Open

build_library: fix Exoscale image format, size, and compression #4075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion build_library/vm_image_util.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,8 @@ IMG_cloudstack_vhd_OEM_SYSEXT=cloudstack
IMG_digitalocean_OEM_SYSEXT=digitalocean

## exoscale
IMG_exoscale_DISK_FORMAT=qcow2
IMG_exoscale_DISK_FORMAT=exoscale
IMG_exoscale_DISK_EXTENSION=qcow2
IMG_exoscale_OEM_SYSEXT=exoscale

## azure
Expand Down Expand Up @@ -477,6 +478,15 @@ _write_qcow2_disk() {
assert_image_size "$2" qcow2
}

_write_exoscale_disk() {
qemu-img convert -f raw "$1" -O qcow2 -c -o compat=0.10 "$2"
# Exoscale images should be exactly 10G. This is the minimum for
# Custom Templates, and it also can't be any larger because it
# would prevent creation of an instance with the 10G disk size option.
qemu-img resize "$2" 10G
assert_image_size "$2" qcow2
}

_write_vhd_disk() {
qemu-img convert -f raw "$1" -O vpc -o force_size "$2"
assert_image_size "$2" vpc
Expand Down
2 changes: 1 addition & 1 deletion ci-automation/vms.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ function _vm_build_impl() {
COMPRESSION_FORMAT="bz2,none"
elif [[ "${format}" =~ ^(hyperv|hyperv_vhdx)$ ]];then
COMPRESSION_FORMAT="zip"
elif [[ "${format}" =~ ^(scaleway|kubevirt|proxmoxve|stackit)$ ]];then
elif [[ "${format}" =~ ^(scaleway|kubevirt|proxmoxve|stackit|exoscale)$ ]];then
COMPRESSION_FORMAT="none"
elif [[ "${format}" =~ ^(akamai)$ ]];then
COMPRESSION_FORMAT="gz"
Expand Down