Merge pull request #12113 from simondeziel/misc-fix

Use smaller ISO files in tests
canonical · Aug 4, 2023 · 8403f05 · 8403f05
2 parents d0e22ea + 6ad0451
commit 8403f05
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -4,4 +4,3 @@ API:
 - shared/api/**/*
 Documentation:
 - doc/**/*
-- .sphinx/**/*
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -180,6 +180,10 @@ jobs:
             xfsprogs \
             xz-utils \
             zfsutils-linux
+
+          # reclaim some space
+          sudo apt-get clean
+
           mkdir -p "$(go env GOPATH)/bin"
           curl -sSfL https://dl.min.io/server/minio/release/linux-amd64/minio --output "$(go env GOPATH)/bin/minio"
           chmod +x "$(go env GOPATH)/bin/minio"

diff --git a/test/suites/backup.sh b/test/suites/backup.sh
@@ -10,7 +10,7 @@ test_storage_volume_recover() {
   lxc storage volume create "${poolName}" vol1 --type=block
 
   # Import ISO.
-  truncate -s 25MiB foo.iso
+  truncate -s 8MiB foo.iso
   lxc storage volume import "${poolName}" ./foo.iso vol2 --type=iso
 
   # Delete database entry of the created custom block volume.

diff --git a/test/suites/migration.sh b/test/suites/migration.sh
@@ -566,7 +566,7 @@ migration() {
   lxc_remote rm -f l2:c1
 
   # migrate ISO custom volumes
-  truncate -s 25MiB foo.iso
+  truncate -s 8MiB foo.iso
   lxc storage volume import l1:"${pool}" ./foo.iso iso1
   lxc storage volume copy l1:"${pool}"/iso1 l2:"${remote_pool}"/iso1
 

diff --git a/test/suites/storage_local_volume_handling.sh b/test/suites/storage_local_volume_handling.sh
@@ -238,7 +238,7 @@ test_storage_local_volume_handling() {
           ! lxc storage volume get "lxdtest-$(basename "${LXD_DIR}")-${target_driver}" vol5/snapremove user.foo || false
 
           # copy ISO custom volumes
-          truncate -s 25MiB foo.iso
+          truncate -s 8MiB foo.iso
           lxc storage volume import "lxdtest-$(basename "${LXD_DIR}")-${source_driver}" ./foo.iso iso1
           lxc storage volume copy "lxdtest-$(basename "${LXD_DIR}")-${source_driver}"/iso1 "lxdtest-$(basename "${LXD_DIR}")-${target_driver}"/iso1
           lxc storage volume show "lxdtest-$(basename "${LXD_DIR}")-${target_driver}" iso1 | grep -q 'content_type: iso'

diff --git a/test/suites/storage_volume_import.sh b/test/suites/storage_volume_import.sh
@@ -1,6 +1,6 @@
 test_storage_volume_import() {
-  truncate -s 25MiB foo.iso
-  truncate -s 25MiB foo.img
+  truncate -s 8MiB foo.iso
+  truncate -s 8MiB foo.img
 
   ensure_import_testimage