Fix test findings

ebcl/__init__.py

@@ -1 +1 @@
-__version__ = "1.3.2"
+__version__ = "1.3.3"

ebcl/common/cache.py

@@ -38,9 +38,13 @@ def __init__(self, folder: Optional[str] = None):
         self.index_file = os.path.join(self.folder, 'index.json')
 
         if os.path.isfile(self.index_file):
-            with open(self.index_file, encoding='utf8') as f:
-                data = f.read()
-                self.index: list[Package] = jsonpickle.decode(data)
+            try:
+                with open(self.index_file, encoding='utf8') as f:
+                    data = f.read()
+                    self.index: list[Package] = jsonpickle.decode(data)
+            except Exception as e:
+                logging.error('Loading cache state failed! %s', e)
+                self.index = []
         else:
             self.index = []
 

ebcl/common/config.py

@@ -126,7 +126,7 @@ def __init__(self, config_file: str, output_path: str):
         # Primary repo for debootstrap
         self.primary_distro: Optional[str] = None
         # Additional debootstrap parameters
-        self.debootstrap_flags: Optional[str] = None
+        self.debootstrap_flags: Optional[str] = '--include=ca-certificates'
         # Password for the root user
         self.root_password: Optional[str] = 'linux'
         # Hostname for the root filesystem

ebcl/tools/boot/boot.py

@@ -3,6 +3,7 @@
 import argparse
 import logging
 import os
+import shutil
 import tempfile
 
 from typing import Optional
@@ -40,10 +41,11 @@ def __init__(self, config_file: str, output_path: str):
 
     def download_deb_packages(self, package_dir: str):
         """ Download all needed deb packages. """
-        (_debs, _contents, missing) = self.proxy.download_deb_packages(
+        (debs, _contents, missing) = self.proxy.download_deb_packages(
             packages=self.config.packages,
             contents=package_dir
         )
+        shutil.rmtree(debs)
 
         if missing:
             logging.critical('Not found packages: %s', missing)
@@ -113,7 +115,7 @@ def create_boot(self) -> Optional[str]:
 
         # Remove package temporary folder
         logging.info('Remove temporary package contents...')
-        self.fake.run_cmd(f'rm -rf {package_dir}', check=False)
+        self.fake.run_sudo(f'rm -rf {package_dir}', check=False)
 
         if self.config.tar:
             # create tar archive
@@ -135,6 +137,13 @@ def create_boot(self) -> Optional[str]:
                           fix_ownership=True)
         return output_path
 
+    @log_exception()
+    def finalize(self):
+        """ Finalize output and cleanup. """
+
+        # delete temporary folder
+        self.config.fake.run_sudo(f'rm -rf {self.config.target_dir}')
+
 
 @log_exception(call_exit=True)
 def main() -> None:
@@ -163,6 +172,7 @@ def main() -> None:
 
     # Create the boot.tar
     image = generator.create_boot()
+    generator.finalize()
 
     if image:
         print(f'Results were written to {image}.')

ebcl/tools/initrd/initrd.py

@@ -5,6 +5,7 @@
 import logging
 import os
 import queue
+import shutil
 import tempfile
 
 from pathlib import Path
@@ -210,12 +211,14 @@ def add_devices(self):
 
     def download_deb_packages(self, allow_missing=False):
         """ Download all needed deb packages. """
-        (_debs, _contents, missing) = self.proxy.download_deb_packages(
+        (debs, _contents, missing) = self.proxy.download_deb_packages(
             packages=self.config.packages,
             contents=self.target_dir,
             download_depends=True
         )
 
+        shutil.rmtree(debs)
+
         if not allow_missing and missing:
             logging.critical('Not found packages: %s', missing)
             raise InvalidConfiguration(f'Not found packages: {missing}')
@@ -253,10 +256,12 @@ def create_initrd(self) -> Optional[str]:
         elif self.config.kernel:
             mods_dir = tempfile.mkdtemp()
             logging.info('Using modules from kernel deb packages...')
-            (_debs, _contents, missing) = self.config.proxy.download_deb_packages(
+            (debs, _contents, missing) = self.config.proxy.download_deb_packages(
                 packages=[self.config.kernel],
                 contents=mods_dir
             )
+            shutil.rmtree(debs)
+
             if missing:
                 logging.error('Not found packages: %s', missing)
         elif self.config.modules:

ebcl/tools/root/debootstrap.py

@@ -38,7 +38,8 @@ def _get_apt_hash(self, debootstrap_hash: str) -> str:
     def _get_debootstrap_hash(self) -> str:
         """ Generate hash for the debootstrap configuration. """
         params = f'{self.config.arch} {self.debootstrap_variant} ' \
-            f'{self.config.primary_distro} {self._find_deboostrap_repo()}'
+            f'{self.config.primary_distro} {self._find_deboostrap_repo()} ' \
+            f'{self.config.debootstrap_flags}'
 
         return hashlib.md5(params.encode('utf-8')).digest().hex()
 
@@ -77,7 +78,10 @@ def _generate_apt_config(self):
                 components = ' '.join(apt.components)
                 f.write(f'deb {apt.url} {apt.distro} {components}\n\n')
 
-                (_key_pub_file, key_gpg_file) = apt.get_key_files()
+                (key_pub_file, key_gpg_file) = apt.get_key_files()
+                if key_pub_file:
+                    os.remove(key_pub_file)
+
                 fake.run_sudo(
                     f'cp {key_gpg_file} {apt_key_dir}',
                     cwd=self.config.target_dir,
@@ -160,7 +164,10 @@ def _run_debootstrap(self) -> bool:
             return False
 
         keyring = ''
-        (_pub, gpg) = repo.get_key_files()
+        (pub, gpg) = repo.get_key_files()
+        if pub:
+            os.remove(pub)
+
         if gpg is not None:
             keyring = f' --keyring={gpg} '
 

ebcl/tools/root/kiwi.py

@@ -137,7 +137,10 @@ def _generate_berrymill_config(
     cnt = 1
     for apt in config.apt_repos:
         apt_repo_key = None
-        (_pub, apt_repo_key) = apt.get_key_files(result_dir)
+        (pub, apt_repo_key) = apt.get_key_files(result_dir)
+        if pub:
+            os.remove(pub)
+
         if not apt_repo_key:
             logging.error('No key found for %s, skipping repo!', apt)
             continue

ebcl/tools/root/root.py

@@ -171,7 +171,7 @@ def finalize(self):
 @log_exception(call_exit=True)
 def main() -> None:
     """ Main entrypoint of EBcL root generator. """
-    init_logging('DEBUG')
+    init_logging()
 
     logging.info('\n=========================\n'
                  'EBcL Root Generator %s\n'