pungi/phases/createiso.py

@@ -517,15 +517,13 @@ def add_iso_to_metadata(
     return img
 
 
-def run_createiso_command(
-    num, compose, bootable, arch, cmd, mounts, log_file, with_jigdo=False
-):
+def run_createiso_command(num, compose, bootable, arch, cmd, mounts, log_file):
     packages = [
         "coreutils",
         "xorriso" if compose.conf.get("createiso_use_xorrisofs") else "genisoimage",
         "isomd5sum",
     ]
-    if with_jigdo and compose.conf["create_jigdo"]:
+    if compose.conf["create_jigdo"]:
         packages.append("jigdo")
     if bootable:
         extra_packages = {

pungi/phases/extra_isos.py

@@ -164,7 +164,6 @@ class ExtraIsosThread(WorkerThread):
                 log_file=compose.paths.log.log_file(
                     arch, "extraiso-%s" % os.path.basename(iso_path)
                 ),
-                with_jigdo=compose.conf["create_jigdo"],
             )
 
         img = add_iso_to_metadata(

tests/test_extra_isos_phase.py

@@ -148,7 +148,6 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                     log_file=os.path.join(
                         self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log"
                     ),
-                    with_jigdo=False,
                 )
             ],
         )
@@ -224,7 +223,6 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                     log_file=os.path.join(
                         self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log"
                     ),
-                    with_jigdo=False,
                 )
             ],
         )
@@ -298,7 +296,6 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                     log_file=os.path.join(
                         self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log"
                     ),
-                    with_jigdo=False,
                 )
             ],
         )
@@ -374,7 +371,6 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                     log_file=os.path.join(
                         self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log"
                     ),
-                    with_jigdo=False,
                 )
             ],
         )
@@ -445,7 +441,6 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                     log_file=os.path.join(
                         self.topdir, "logs/src/extraiso-my.iso.src.log"
                     ),
-                    with_jigdo=False,
                 )
             ],
         )