Skip to content

Commit bc0e34c

Browse files
committed
.github: Remove bz2 compression layer from zip artifacts
The GitHub Action artifacts are compressed zip files which include bz2 files which are either the raw .bin images that have many zero bytes in the rootfs but the main data in /usr is using zstd compression, or they are the qcow2 .img images which are compressed themselves (and of course have the same /usr compression). The bz2 compression doesn't help in our case. Remove the bz2 compression layer. If in the future non-zip artifacts are supported we can add it back for the .bin image only by using explicit calls only for that file instead of the --image_compression_formats= flag for all images.
1 parent de3a39b commit bc0e34c

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.github/workflows/ci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ jobs:
225225
./run_sdk_container -n "${container_name}" \
226226
./image_to_vm.sh --format "${format}" --board="${arch}-usr" \
227227
--from "${CI_CONTAINER_ARTIFACT_ROOT}/${arch}-usr/latest" \
228-
--image_compression_formats=bz2
228+
--image_compression_formats=none
229229
done
230230
231231
# Zip doesn't handle symlinks well, remove them
@@ -271,7 +271,7 @@ jobs:
271271
retention-days: 7
272272
name: ${{ matrix.arch }}-generic-image
273273
path: |
274-
scripts/artifacts/images/flatcar_production_image.bin.bz2
274+
scripts/artifacts/images/flatcar_production_image.bin
275275
scripts/artifacts/images/flatcar_production_image.grub
276276
scripts/artifacts/images/flatcar_production_image.shim
277277
scripts/artifacts/images/flatcar_production_image.vmlinuz
@@ -314,8 +314,8 @@ jobs:
314314
retention-days: 7
315315
name: ${{ matrix.arch }}-vm-images
316316
path: |
317-
scripts/artifacts/images/*.img.bz2
318-
scripts/artifacts/images/*.bin.bz2
317+
scripts/artifacts/images/*.img
318+
scripts/artifacts/images/*.bin
319319
scripts/artifacts/images/flatcar_production_*_efi_*.fd
320320
scripts/artifacts/images/*.txt
321321
scripts/artifacts/images/flatcar_production_*.sh

.github/workflows/run-kola-tests.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ jobs:
162162
# Extract the generic image we'll use for qemu tests.
163163
# Note that the qemu[_uefi] tests use the generic image instead of the
164164
# qemu vendor VM image ("Astronaut: [...] Always have been.").
165-
bzip2 --decompress flatcar_production_image.bin.bz2
166165
mv flatcar_production_image.bin flatcar_production_qemu_uefi_efi_code.fd scripts/
167166
168167
mv flatcar_test_update.gz scripts/

0 commit comments

Comments
 (0)