Merge pull request #2819 from OSInside/cleanup_build_metadata

Cleanup build metadata

Author: Conan-Kudo

kiwi/builder/disk.py

@@ -926,6 +926,10 @@ def _build_main_system(
                             ]
                         )
 
+                    # cleanup build metadata
+                    if os.access(f'{root}/', os.W_OK):
+                        disk_system.cleanup()
+
                     # set root filesystem properties
                     if system:
                         self._setup_property_root_is_readonly_snapshot(system)

kiwi/system/setup.py

@@ -168,9 +168,20 @@ def cleanup(self) -> None:
         Command.run(
             [
                 'chroot', self.root_dir,
-                'rm', '-rf', '.kconfig', defaults.IMAGE_METADATA_DIR
+                'rm', '-f',
+                '.kconfig',
+                '.profile',
+                'config.bootoptions',
+                'config.partids'
             ]
         )
+        meta_dir = f'{self.root_dir}/{defaults.IMAGE_METADATA_DIR}'
+        if os.path.isdir(meta_dir):
+            image_meta = MountManager(
+                device='none', mountpoint=meta_dir
+            )
+            image_meta.umount()
+            Path.wipe(meta_dir)
 
     def import_repositories_marked_as_imageinclude(self) -> None:
         """

test/unit/builder/disk_test.py

@@ -870,6 +870,7 @@ def test_create_disk_standard_root_with_dracut_initrd(
         ]
         disk_system.call_pre_disk_script.assert_called_once_with()
         disk_system.call_disk_script.assert_called_once_with()
+        disk_system.cleanup.assert_called_once_with()
         self.setup.call_edit_boot_config_script.assert_called_once_with(
             'btrfs', 1
         )

test/unit/system/setup_test.py

@@ -373,9 +373,24 @@ def side_effect(arg):
     @patch('kiwi.command.Command.run')
     def test_cleanup(self, mock_command):
         self.setup.cleanup()
-        mock_command.assert_called_once_with(
-            ['chroot', 'root_dir', 'rm', '-rf', '.kconfig', 'image']
-        )
+        assert mock_command.call_args_list == [
+            call(
+                [
+                    'chroot', 'root_dir', 'rm', '-f',
+                    '.kconfig',
+                    '.profile',
+                    'config.bootoptions',
+                    'config.partids'
+                ]
+            ),
+            call(
+                command=['mountpoint', '-q', 'root_dir/image'],
+                raise_on_error=False
+            ),
+            call(
+                ['rm', '-r', '-f', 'root_dir/image']
+            )
+        ]
 
     @patch('kiwi.system.setup.ArchiveTar')
     @patch('kiwi.system.setup.glob.iglob')