From e88f12c69cd78041d2994d8883907ec37a32e7ef Mon Sep 17 00:00:00 2001 From: Gabriel Adrian Samfira Date: Tue, 8 Mar 2022 12:27:18 +0000 Subject: [PATCH] Rename zstd to zst Rename sztd to zst and amend the changelog. The zstd binary generates a compressed file with the .zst extension by default. Signed-off-by: Gabriel Adrian Samfira --- build_library/release_util.sh | 6 +++--- .../changes/2022-02-22-configurable-image-compression.md | 2 +- jenkins/vms.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build_library/release_util.sh b/build_library/release_util.sh index 9f3e766798..1c9cb23323 100644 --- a/build_library/release_util.sh +++ b/build_library/release_util.sh @@ -41,7 +41,7 @@ DEFINE_string sign "" \ DEFINE_string sign_digests "" \ "Sign image DIGESTS files with the given GPG key." DEFINE_string image_compression_formats "${DEFAULT_IMAGE_COMPRESSION_FORMAT}" \ - "Compress the resulting images using thise formats. This option acceps a list of comma separated values. Options are: none, bz2, gz, zip, zstd" + "Compress the resulting images using thise formats. This option acceps a list of comma separated values. Options are: none, bz2, gz, zip, zst" compress_file() { @@ -65,8 +65,8 @@ compress_file() { "zip") IMAGE_ZIPPER="pigz --keep --zip" ;; - "zstd") - IMAGE_ZIPPER="zstd --format=zstd -k -q -f --no-progress -o ${filepath}.${compression_format}" + "zst") + IMAGE_ZIPPER="zstd --format=zstd -k -q --no-progress" ;; *) die "Unsupported compression format ${compression_format}" diff --git a/changelog/changes/2022-02-22-configurable-image-compression.md b/changelog/changes/2022-02-22-configurable-image-compression.md index a0a19f82fc..3112faf1a1 100644 --- a/changelog/changes/2022-02-22-configurable-image-compression.md +++ b/changelog/changes/2022-02-22-configurable-image-compression.md @@ -1,2 +1,2 @@ - OpenStack: In addition to the `bz2` image, a `gz` compressed image is published. This allows Glance to directly consume the images by simply passing in the URL of the image. -- SDK: The image compression format is now configurable. Supported formats are: `bz2`, `gz`, `zip`, `none`, `zstd`. Selecting the image format can now be done by passing the `--image_compression_formats` option. This flag gets a comma separated list of formats. +- SDK: The image compression format is now configurable. Supported formats are: `bz2`, `gz`, `zip`, `none`, `zst`. Selecting the image format can now be done by passing the `--image_compression_formats` option. This flag gets a comma separated list of formats. diff --git a/jenkins/vms.sh b/jenkins/vms.sh index 9b6aad48f8..494f7f1bb1 100755 --- a/jenkins/vms.sh +++ b/jenkins/vms.sh @@ -116,7 +116,7 @@ for FORMAT in ${FORMATS}; do COMPRESSION_FORMAT="bz2" if [[ "${FORMAT}" =~ ^(openstack|openstack_mini)$ ]];then - COMPRESSION_FORMAT="gz" + COMPRESSION_FORMAT="gz,bz2" fi script image_to_vm.sh \ @@ -130,7 +130,7 @@ for FORMAT in ${FORMATS}; do --sign_digests="${SIGNING_USER}" \ --download_root="${DOWNLOAD_ROOT}" \ --upload_root="${UPLOAD_ROOT}" \ - --image_compression_format="${COMPRESSION_FORMAT}" \ + --image_compression_formats="${COMPRESSION_FORMAT}" \ --upload \ ${PRIVATE_UPLOAD_OPT} done