From 6e773f8676528bdd0b3f0499bcc1614f257bafde Mon Sep 17 00:00:00 2001 From: Jon Disnard Date: Tue, 1 Sep 2015 17:14:46 -0500 Subject: [PATCH] Disable jigdo by default, saves a lot of time. Signed-off-by: Jon Disnard --- doc/configuration.rst | 6 ++++++ pungi/phases/createiso.py | 32 +++++++++++++++++--------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/doc/configuration.rst b/doc/configuration.rst index 3566b1df..b00a4db7 100644 --- a/doc/configuration.rst +++ b/doc/configuration.rst @@ -451,10 +451,14 @@ Options **createiso_skip** = False (*list*) -- mapping that defines which variants and arches to skip during createiso; format: [(variant_uid_regex, {arch|*: True})] +**create_jigdo** = False + (*bool*) -- controls the creation of jigdo from ISO + .. note:: Source architecture needs to be listed explicitly. Excluding '*' applies only on binary arches. + Jigdo causes significant increase of time to ISO creation. Example @@ -468,6 +472,8 @@ Example }), ] + + Image Build Settings ==================== diff --git a/pungi/phases/createiso.py b/pungi/phases/createiso.py index ebe10b02..83e9ff3a 100644 --- a/pungi/phases/createiso.py +++ b/pungi/phases/createiso.py @@ -162,21 +162,23 @@ class CreateisoPhase(PhaseBase): cmd["cmd"].append(iso.get_manifest_cmd(iso_name)) # create jigdo - jigdo = JigdoWrapper(logger=self.compose._logger) - jigdo_dir = self.compose.paths.compose.jigdo_dir(arch, variant) - files = [ - { - "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) - - cmd["cmd"] = " && ".join(cmd["cmd"]) - commands.append(cmd) + create_jigdo = compose.conf.get("create_jigdo", False) + if create_jigdo: + jigdo = JigdoWrapper(logger=self.compose._logger) + jigdo_dir = self.compose.paths.compose.jigdo_dir(arch, variant) + files = [ + { + "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) + + cmd["cmd"] = " && ".join(cmd["cmd"]) + commands.append(cmd) for cmd in commands: self.pool.add(CreateIsoThread(self.pool))