Merge pull request #2609 from OSInside/increase_default_volume_size

Increase default volume size
OSInside · Aug 7, 2024 · 47ebc8c · 47ebc8c
2 parents f68c0d9 + 4b60c92
commit 47ebc8c
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/build-tests/x86/tumbleweed/test-image-raid/appliance.kiwi b/build-tests/x86/tumbleweed/test-image-raid/appliance.kiwi
@@ -16,7 +16,7 @@
         <rpm-check-signatures>false</rpm-check-signatures>
         <bootsplash-theme>breeze</bootsplash-theme>
         <bootloader-theme>openSUSE</bootloader-theme>
-        <type image="oem" filesystem="ext4" kernelcmdline="splash" firmware="efi" mdraid="mirroring" installiso="true" installboot="install">
+        <type image="oem" filesystem="btrfs" kernelcmdline="splash" firmware="efi" mdraid="mirroring" installiso="true" installboot="install">
             <oemconfig>
                 <oem-device-filter>/dev/ram</oem-device-filter>
                 <oem-multipath-scan>false</oem-multipath-scan>
@@ -77,6 +77,7 @@
         <package name="gzip"/>
         <package name="udev"/>
         <package name="xz"/>
+        <package name="shadow"/>
         <package name="filesystem"/>
         <package name="glibc-locale"/>
         <package name="cracklib-dict-full"/>

diff --git a/kiwi/defaults.py b/kiwi/defaults.py
@@ -1156,7 +1156,7 @@ def get_min_volume_mbytes():
 
         :rtype: int
         """
-        return 30
+        return 120
 
     @staticmethod
     def get_lvm_overhead_mbytes():

diff --git a/test/unit/storage/setup_test.py b/test/unit/storage/setup_test.py
@@ -212,7 +212,7 @@ def test_get_disksize_mbytes_partition_too_small(self, mock_os_path_exists):
     @patch('os.path.exists')
     def test_get_disksize_mbytes_volumes(self, mock_exists):
         mock_exists.side_effect = lambda path: path != 'root_dir/newfolder'
-        assert self.setup_volumes.get_disksize_mbytes() == 2144
+        assert self.setup_volumes.get_disksize_mbytes() == 2774
 
     @patch('os.path.exists')
     def test_get_disksize_mbytes_partitions(self, mock_exists):

diff --git a/test/unit/system/profile_test.py b/test/unit/system/profile_test.py
@@ -81,9 +81,9 @@ def test_create_oem(self, mock_which):
         os.remove(self.profile_file)
         assert self.profile.dot_profile == {
             'kiwi_Volume_1': 'usr_lib|size:1024|usr/lib',
-            'kiwi_Volume_2': 'etc_volume|freespace:30|etc',
+            'kiwi_Volume_2': 'etc_volume|freespace:120|etc',
             'kiwi_Volume_3': 'bin_volume|size:all|/usr/bin',
-            'kiwi_Volume_4': 'usr_bin|freespace:30|usr/bin',
+            'kiwi_Volume_4': 'usr_bin|freespace:120|usr/bin',
             'kiwi_Volume_5': 'LVSwap|size:128|',
             'kiwi_Volume_Root': 'LVRoot|freespace:500|',
             'kiwi_bootkernel': None,

diff --git a/test/unit/volume_manager/base_test.py b/test/unit/volume_manager/base_test.py
@@ -124,7 +124,7 @@ def test_get_volume_mbsize(
         assert self.volume_manager.get_volume_mbsize(
             self.volume_manager.volumes[0], self.volume_manager.volumes,
             'ext3'
-        ) == 272
+        ) == 362
 
     @patch('kiwi.volume_manager.base.SystemSize')
     @patch('os.path.exists')
@@ -140,7 +140,7 @@ def test_get_volume_mbsize_for_oem_type(
         assert self.volume_manager.get_volume_mbsize(
             self.volume_manager.volumes[0], self.volume_manager.volumes,
             'ext3', True
-        ) == 72
+        ) == 162
 
     @patch('kiwi.volume_manager.base.SystemSize')
     @patch('os.path.exists')
@@ -168,7 +168,7 @@ def test_get_volume_mbsize_nested_volumes(
         assert self.volume_manager.get_volume_mbsize(
             self.volume_manager.volumes[0], self.volume_manager.volumes,
             'ext3'
-        ) == 272
+        ) == 362
         size.accumulate_mbyte_file_sizes.assert_called_once_with(
             ['root_dir/usr/lib']
         )
@@ -204,7 +204,7 @@ def test_get_volume_mbsize_root_volume(
         assert self.volume_manager.get_volume_mbsize(
             self.volume_manager.volumes[2], self.volume_manager.volumes,
             'ext3', True
-        ) == 72
+        ) == 162
         size.accumulate_mbyte_file_sizes.assert_called_once_with(
             ['root_dir/usr', 'root_dir/usr/lib']
         )

diff --git a/test/unit/xml_state_test.py b/test/unit/xml_state_test.py
@@ -434,7 +434,7 @@ def test_get_volumes_for_arch(self):
             volume_type(
                 name='usr_lib',
                 parent='',
-                size='freespace:30',
+                size='freespace:120',
                 realpath='usr/lib',
                 mountpoint='usr/lib',
                 fullsize=False,
@@ -493,7 +493,7 @@ def test_get_volumes(self):
                 is_root_volume=True
             ),
             volume_type(
-                name='etc_volume', parent='', size='freespace:30',
+                name='etc_volume', parent='', size='freespace:120',
                 realpath='etc',
                 mountpoint='etc', fullsize=False,
                 label=None,
@@ -557,7 +557,7 @@ def test_get_volumes_no_explicit_root_setup_other_fullsize_volume(self):
                 is_root_volume=False
             ),
             volume_type(
-                name='LVRoot', parent='', size='freespace:30', realpath='/',
+                name='LVRoot', parent='', size='freespace:120', realpath='/',
                 mountpoint=None, fullsize=False,
                 label=None,
                 attributes=[],