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

Merge #61 make jigdo optional (iii)

Browse Source
This commit is contained in:
Jon Disnard 2015-09-15 13:39:15 -05:00
commit fd537e5070
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/configuration.rst
View File

@ -451,10 +451,14 @@ Options
**createiso_skip** = False **createiso_skip** = False
(*list*) -- mapping that defines which variants and arches to skip during createiso; format: [(variant_uid_regex, {arch|*: True})] (*list*) -- mapping that defines which variants and arches to skip during createiso; format: [(variant_uid_regex, {arch|*: True})]
**create_jigdo** = True
(*bool*) -- controls the creation of jigdo from ISO
.. note:: .. note::
Source architecture needs to be listed explicitly. Source architecture needs to be listed explicitly.
Excluding '*' applies only on binary arches. Excluding '*' applies only on binary arches.
Jigdo causes significant increase of time to ISO creation.
Example Example

30
pungi/phases/createiso.py
View File

@ -162,21 +162,23 @@ class CreateisoPhase(PhaseBase):
cmd["cmd"].append(iso.get_manifest_cmd(iso_name)) cmd["cmd"].append(iso.get_manifest_cmd(iso_name))
# create jigdo # create jigdo
jigdo = JigdoWrapper(logger=self.compose._logger) create_jigdo = compose.conf.get("create_jigdo", True)
jigdo_dir = self.compose.paths.compose.jigdo_dir(arch, variant) if create_jigdo:
files = [ jigdo = JigdoWrapper(logger=self.compose._logger)
{ jigdo_dir = self.compose.paths.compose.jigdo_dir(arch, variant)
"path": os_tree, files = [
"label": None, {
"uri": None, "path": os_tree,
} "label": None,
] "uri": None,
jigdo_cmd = jigdo.get_jigdo_cmd(iso_path, files, output_dir=jigdo_dir, no_servers=True, report="noprogress") }
jigdo_cmd = " ".join([pipes.quote(i) for i in jigdo_cmd]) ]
cmd["cmd"].append(jigdo_cmd) jigdo_cmd = jigdo.get_jigdo_cmd(iso_path, files, output_dir=jigdo_dir, no_servers=True, report="noprogress")
jigdo_cmd = " ".join([pipes.quote(i) for i in jigdo_cmd])
cmd["cmd"].append(jigdo_cmd)
cmd["cmd"] = " && ".join(cmd["cmd"]) cmd["cmd"] = " && ".join(cmd["cmd"])
commands.append(cmd) commands.append(cmd)
for cmd in commands: for cmd in commands:
self.pool.add(CreateIsoThread(self.pool)) self.pool.add(CreateIsoThread(self.pool))