enable logs in general

iso/empanadas/empanadas/templates/buildExtraImage.tmpl.sh

@@ -2,27 +2,23 @@
 set -ex
 
 {% if extra_iso_mode == "podman" %}
-{{ lorax_pkg_cmd }}
-mkdir /builddir
+{{ lorax_pkg_cmd }} | tee -a {{ log_path }}
+mkdir -p {{ compose_work_iso_dir }}/{{ arch }}
+cd  {{ compose_work_iso_dir  }}/{{ arch }}
+{% else %}
+cd /builddir
 {% endif %}
 
-cd /builddir
 
 if ! TEMPLATE="$($(head -n1 $(which lorax) | cut -c3-) -c 'import pylorax; print(pylorax.find_templates())')"; then
   TEMPLATE="/usr/share/lorax"
 fi
 
-{{ make_image }}
+{{ make_image }} | tee -a {{ log_path }}
 
-{{ isohybrid }}
+{{ isohybrid }} | tee -a {{ log_path }}
 
-{{ implantmd5 }}
+{{ implantmd5 }} | tee -a {{ log_path }}
 
-{{ make_manifest }}
+{{ make_manifest }} | tee -a {{ log_path }}
 
-{% if extra_iso_mode == "podman" %}
-mkdir -p {{ compose_work_iso_dir }}/{{ arch }}
-cp /builddir/*.iso {{ compose_work_iso_dir }}/{{ arch }}
-cp /builddir/*.iso.manifest {{ compose_work_iso_dir }}/{{ arch }}
-#cp /builddir/*.log {{ compose_work_iso_dir }}/{{ arch }}
-{% endif %}

iso/empanadas/empanadas/util/iso_utils.py

@@ -933,7 +933,6 @@ class IsoBuild:
 
                 if self.extra_iso_mode == 'local':
                     self._extra_iso_local_run(a, y, work_root)
-                    print()
                 elif self.extra_iso_mode == 'podman':
                     continue
                 else:
@@ -965,6 +964,17 @@ class IsoBuild:
         iso_template_path = '{}/buildExtraImage-{}-{}.sh'.format(entries_dir, arch, image)
         xorriso_template_path = '{}/xorriso-{}-{}.txt'.format(entries_dir, arch, image)
 
+        log_root = os.path.join(
+                work_root,
+                "logs",
+                self.date_stamp
+        )
+
+        if not os.path.exists(log_root):
+            os.makedirs(log_root, exist_ok=True)
+
+        log_path = '{}/{}-{}.log'.format(log_root, arch, image)
+
         # This is kind of a hack. Installing xorrisofs sets the alternatives to
         # it, so backwards compatibility is sort of guaranteed. But we want to
         # emulate as close as possible to what pungi does, so unless we
@@ -1052,6 +1062,7 @@ class IsoBuild:
                 implantmd5=implantmd5,
                 make_manifest=make_manifest,
                 lorax_pkg_cmd=lorax_pkg_cmd,
+                log_path=log_path,
         )
 
         if opts['use_xorrisofs']: