kiwibuild: Process images same as image-build
Getting the images from task is less hacky then matching on filenames.
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
(cherry picked from commit b032425f30
)
This commit is contained in:
parent
a6f6199910
commit
a196e9c895
@ -169,67 +169,57 @@ class RunKiwiBuildThread(WorkerThread):
|
|||||||
|
|
||||||
# Process all images in the build. There should be one for each
|
# Process all images in the build. There should be one for each
|
||||||
# architecture, but we don't verify that.
|
# architecture, but we don't verify that.
|
||||||
build_info = koji.koji_proxy.listBuilds(taskID=task_id)[0]
|
paths = koji.get_image_paths(task_id)
|
||||||
for archive in koji.koji_proxy.listArchives(buildID=build_info["build_id"]):
|
|
||||||
if archive["type_name"] not in EXTENSIONS:
|
|
||||||
# Ignore values that are not of required types.
|
|
||||||
continue
|
|
||||||
|
|
||||||
# HACK: there's no metadata telling which image is for which
|
for arch, paths in paths.items():
|
||||||
# architecture, so we need to check the filename.
|
for path in paths:
|
||||||
for arch in arches:
|
type_, suffix = _find_suffix(path)
|
||||||
if arch in archive["filename"]:
|
if not suffix:
|
||||||
break
|
# Path doesn't match any know type.
|
||||||
else:
|
continue
|
||||||
raise RuntimeError("Image doesn't have any architecture!")
|
|
||||||
|
|
||||||
# image_dir is absolute path to which the image should be copied.
|
# image_dir is absolute path to which the image should be copied.
|
||||||
# We also need the same path as relative to compose directory for
|
# We also need the same path as relative to compose directory for
|
||||||
# including in the metadata.
|
# including in the metadata.
|
||||||
image_dir = compose.paths.compose.image_dir(variant) % {"arch": arch}
|
image_dir = compose.paths.compose.image_dir(variant) % {"arch": arch}
|
||||||
rel_image_dir = compose.paths.compose.image_dir(
|
rel_image_dir = compose.paths.compose.image_dir(
|
||||||
variant, relative=True
|
variant, relative=True
|
||||||
) % {"arch": arch}
|
) % {"arch": arch}
|
||||||
util.makedirs(image_dir)
|
util.makedirs(image_dir)
|
||||||
|
|
||||||
image_dest = os.path.join(image_dir, archive["filename"])
|
filename = os.path.basename(path)
|
||||||
|
|
||||||
src_file = compose.koji_downloader.get_file(
|
image_dest = os.path.join(image_dir, filename)
|
||||||
os.path.join(
|
|
||||||
koji.koji_module.pathinfo.imagebuild(build_info),
|
|
||||||
archive["filename"],
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
linker.link(src_file, image_dest, link_type=compose.conf["link_type"])
|
src_file = compose.koji_downloader.get_file(path)
|
||||||
|
|
||||||
for suffix in EXTENSIONS[archive["type_name"]]:
|
linker.link(src_file, image_dest, link_type=compose.conf["link_type"])
|
||||||
if archive["filename"].endswith(suffix):
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
# No suffix matched.
|
|
||||||
raise RuntimeError(
|
|
||||||
"Failed to generate metadata. Format %s doesn't match type %s"
|
|
||||||
% (suffix, archive["type_name"])
|
|
||||||
)
|
|
||||||
|
|
||||||
# Update image manifest
|
# Update image manifest
|
||||||
img = Image(compose.im)
|
img = Image(compose.im)
|
||||||
|
|
||||||
# Get the manifest type from the config if supplied, otherwise we
|
# Get the manifest type from the config if supplied, otherwise we
|
||||||
# determine the manifest type based on the koji output
|
# determine the manifest type based on the koji output
|
||||||
img.type = archive["type_name"]
|
img.type = type_
|
||||||
img.format = suffix
|
img.format = suffix
|
||||||
img.path = os.path.join(rel_image_dir, archive["filename"])
|
img.path = os.path.join(rel_image_dir, filename)
|
||||||
img.mtime = util.get_mtime(image_dest)
|
img.mtime = util.get_mtime(image_dest)
|
||||||
img.size = util.get_file_size(image_dest)
|
img.size = util.get_file_size(image_dest)
|
||||||
img.arch = arch
|
img.arch = arch
|
||||||
img.disc_number = 1 # We don't expect multiple disks
|
img.disc_number = 1 # We don't expect multiple disks
|
||||||
img.disc_count = 1
|
img.disc_count = 1
|
||||||
img.bootable = False
|
img.bootable = False
|
||||||
img.subvariant = config.get("subvariant", variant.uid)
|
img.subvariant = config.get("subvariant", variant.uid)
|
||||||
setattr(img, "can_fail", self.can_fail)
|
setattr(img, "can_fail", self.can_fail)
|
||||||
setattr(img, "deliverable", "image-build")
|
setattr(img, "deliverable", "kiwibuild")
|
||||||
compose.im.add(variant=variant.uid, arch=arch, image=img)
|
compose.im.add(variant=variant.uid, arch=arch, image=img)
|
||||||
|
|
||||||
self.pool.log_info("[DONE ] %s (task id: %s)" % (msg, task_id))
|
self.pool.log_info("[DONE ] %s (task id: %s)" % (msg, task_id))
|
||||||
|
|
||||||
|
|
||||||
|
def _find_suffix(path):
|
||||||
|
for type_, suffixes in EXTENSIONS.items():
|
||||||
|
for suffix in suffixes:
|
||||||
|
if path.endswith(suffix):
|
||||||
|
return type_, suffix
|
||||||
|
return None, None
|
||||||
|
@ -613,6 +613,7 @@ class KojiWrapper(object):
|
|||||||
"createImage",
|
"createImage",
|
||||||
"createLiveMedia",
|
"createLiveMedia",
|
||||||
"createAppliance",
|
"createAppliance",
|
||||||
|
"createKiwiImage",
|
||||||
]:
|
]:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user