almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Update from upstream #11

Closed
soksanichenko wants to merge 158 commits from a8_updated into a8
pull from: a8_updated
merge into: almalinux:a8
Conversation 0 Commits 158 Files Changed 128 +2 -10
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1d654522be - Show all commits

6
pungi/phases/createiso.py
View File

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

1
pungi/phases/extra_isos.py
View File

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

5
tests/test_extra_isos_phase.py
View File

@ -148,7 +148,6 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
log_file=os.path.join( log_file=os.path.join(
self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log" 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( log_file=os.path.join(
self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log" 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( log_file=os.path.join(
self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log" 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( log_file=os.path.join(
self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log" 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( log_file=os.path.join(
self.topdir, "logs/src/extraiso-my.iso.src.log" self.topdir, "logs/src/extraiso-my.iso.src.log"
), ),
with_jigdo=False,
) )
], ],
) )