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

[image-build] Use dashes as arch separator in log

Browse Source 
Since multiple images are created in a single Koji task, the path to log
file contains a list of arches. These used to be separated with comma.
For consistency with live-media they are now separated by dashes.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2016-02-15 09:03:34 +01:00
parent abcc51fb85
commit 284d3a3510
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pungi/phases/image_build.py
View File

@ -153,14 +153,15 @@ class CreateImageBuildThread(WorkerThread):
def worker(self, num, compose, cmd): def worker(self, num, compose, cmd):
arches = cmd["image_conf"]["image-build"]['arches'].split(',') arches = cmd["image_conf"]["image-build"]['arches'].split(',')
dash_arches = '-'.join(arches)
log_file = compose.paths.log.log_file( log_file = compose.paths.log.log_file(
cmd["image_conf"]["image-build"]["arches"], dash_arches,
"imagebuild-%s-%s-%s" % ('-'.join(arches), "imagebuild-%s-%s-%s" % (dash_arches,
cmd["image_conf"]["image-build"]["variant"], cmd["image_conf"]["image-build"]["variant"],
cmd["image_conf"]["image-build"]['format'].replace(",", "-")) cmd["image_conf"]["image-build"]['format'].replace(",", "-"))
) )
msg = "Creating %s image (arches: %s, variant: %s)" % (cmd["image_conf"]["image-build"]["format"].replace(",", "-"), msg = "Creating %s image (arches: %s, variant: %s)" % (cmd["image_conf"]["image-build"]["format"].replace(",", "-"),
'-'.join(arches), dash_arches,
cmd["image_conf"]["image-build"]["variant"]) cmd["image_conf"]["image-build"]["variant"])
self.pool.log_info("[BEGIN] %s" % msg) self.pool.log_info("[BEGIN] %s" % msg)
@ -168,7 +169,7 @@ class CreateImageBuildThread(WorkerThread):
# writes conf file for koji image-build # writes conf file for koji image-build
self.pool.log_info("Writing image-build config for %s.%s into %s" % ( self.pool.log_info("Writing image-build config for %s.%s into %s" % (
cmd["image_conf"]["image-build"]["variant"], '-'.join(arches), cmd["conf_file"])) cmd["image_conf"]["image-build"]["variant"], dash_arches, cmd["conf_file"]))
koji_cmd = koji_wrapper.get_image_build_cmd(cmd["image_conf"], koji_cmd = koji_wrapper.get_image_build_cmd(cmd["image_conf"],
conf_file_dest=cmd["conf_file"], conf_file_dest=cmd["conf_file"],
scratch=cmd['scratch']) scratch=cmd['scratch'])