-
Notifications
You must be signed in to change notification settings - Fork 50
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.
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
vm_image_util: produce qcow2 images for Scaleway #1953
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For qcow2 we don't need the bz2 wrapping when introducing a new image format. We can add a case with COMPRESSION_FORMAT=none
for scaleway in ci-automation/vms.sh
The change looks good otherwise: As scaleway images are not in Stable yet I think we can switch the output file behavior.
Fun, it worked without doing nothing. Only EDIT: The why: scripts/build_library/release_util.sh Line 104 in 8e46d15
|
Build action triggered: https://github.com/flatcar/scripts/actions/runs/8844961434 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One nitpick, otherwise looks good.
build_library/vm_image_util.sh
Outdated
@@ -421,6 +425,11 @@ _dst_path() { | |||
# Get the proper disk format extension. | |||
_disk_ext() { | |||
local disk_format=$(_get_vm_opt DISK_FORMAT) | |||
local disk_extension=$(_get_vm_opt DISK_EXTENSION) | |||
if [[ ! -z "${disk_extension}" ]]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Quotes are not necessary in [[
(as opposed to [
), and ! -z
is basically -n
:
if [[ ! -z "${disk_extension}" ]]; then | |
if [[ -n ${disk_extension} ]]; then |
This variable allows to override the disk extension which is initially based on the DISK_FORMAT. Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
For importing Scaleway images, extension needs to be '.qcow2' See: https://www.scaleway.com/en/docs/compute/instances/how-to/snapshot-import-export-feature/ > Make sure that the QCOW / QCOW2 image file you want to import, > uses the file extension .qcow or .qcow2 to avoid issues while importing the image. Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
34fd6b6
to
0a7819a
Compare
Cherry-picked to:
|
For importing Scaleway images, extension needs to be '.qcow2'
See: https://www.scaleway.com/en/docs/compute/instances/how-to/snapshot-import-export-feature/
Testing done
changelog/
directory (user-facing change, bug fix, security fix, update)/boot
and/usr
size, packages, list files for any missing binaries, kernel modules, config files, kernel modules, etc.To be backported on Alpha and Beta.