kojiwrapper: Remove unused code
These methods were used in the live_images phase that doesn't exist anymore. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com> (cherry picked from commit 252044a9118d0a2ccffc91dde64226a9901a9d6b)
This commit is contained in:
Lubomír Sedlář
Stepan Oksanichenko
parent
feffd284a4
commit
4bfbe8afc2
@ -568,126 +568,6 @@ class KojiWrapper(object):
|
|||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def get_image_path(self, task_id):
|
|
||||||
result = []
|
|
||||||
task_info_list = []
|
|
||||||
task_info_list.append(self.koji_proxy.getTaskInfo(task_id, request=True))
|
|
||||||
task_info_list.extend(self.koji_proxy.getTaskChildren(task_id, request=True))
|
|
||||||
|
|
||||||
# scan parent and child tasks for certain methods
|
|
||||||
task_info = None
|
|
||||||
for i in task_info_list:
|
|
||||||
if i["method"] in ("createAppliance", "createLiveCD", "createImage"):
|
|
||||||
task_info = i
|
|
||||||
break
|
|
||||||
|
|
||||||
scratch = task_info["request"][-1].get("scratch", False)
|
|
||||||
task_result = self.koji_proxy.getTaskResult(task_info["id"])
|
|
||||||
task_result.pop("rpmlist", None)
|
|
||||||
|
|
||||||
if scratch:
|
|
||||||
topdir = os.path.join(
|
|
||||||
self.koji_module.pathinfo.work(),
|
|
||||||
self.koji_module.pathinfo.taskrelpath(task_info["id"]),
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
build = self.koji_proxy.getImageBuild(
|
|
||||||
"%(name)s-%(version)s-%(release)s" % task_result
|
|
||||||
)
|
|
||||||
build["name"] = task_result["name"]
|
|
||||||
build["version"] = task_result["version"]
|
|
||||||
build["release"] = task_result["release"]
|
|
||||||
build["arch"] = task_result["arch"]
|
|
||||||
topdir = self.koji_module.pathinfo.imagebuild(build)
|
|
||||||
for i in task_result["files"]:
|
|
||||||
result.append(os.path.join(topdir, i))
|
|
||||||
return result
|
|
||||||
|
|
||||||
def get_wrapped_rpm_path(self, task_id, srpm=False):
|
|
||||||
result = []
|
|
||||||
task_info_list = []
|
|
||||||
task_info_list.extend(self.koji_proxy.getTaskChildren(task_id, request=True))
|
|
||||||
|
|
||||||
# scan parent and child tasks for certain methods
|
|
||||||
task_info = None
|
|
||||||
for i in task_info_list:
|
|
||||||
if i["method"] in ("wrapperRPM"):
|
|
||||||
task_info = i
|
|
||||||
break
|
|
||||||
|
|
||||||
# Get results of wrapperRPM task
|
|
||||||
# {'buildroot_id': 2479520,
|
|
||||||
# 'logs': ['checkout.log', 'root.log', 'state.log', 'build.log'],
|
|
||||||
# 'rpms': ['foreman-discovery-image-2.1.0-2.el7sat.noarch.rpm'],
|
|
||||||
# 'srpm': 'foreman-discovery-image-2.1.0-2.el7sat.src.rpm'}
|
|
||||||
task_result = self.koji_proxy.getTaskResult(task_info["id"])
|
|
||||||
|
|
||||||
# Get koji dir with results (rpms, srpms, logs, ...)
|
|
||||||
topdir = os.path.join(
|
|
||||||
self.koji_module.pathinfo.work(),
|
|
||||||
self.koji_module.pathinfo.taskrelpath(task_info["id"]),
|
|
||||||
)
|
|
||||||
|
|
||||||
# TODO: Maybe use different approach for non-scratch
|
|
||||||
# builds - see get_image_path()
|
|
||||||
|
|
||||||
# Get list of filenames that should be returned
|
|
||||||
result_files = task_result["rpms"]
|
|
||||||
if srpm:
|
|
||||||
result_files += [task_result["srpm"]]
|
|
||||||
|
|
||||||
# Prepare list with paths to the required files
|
|
||||||
for i in result_files:
|
|
||||||
result.append(os.path.join(topdir, i))
|
|
||||||
|
|
||||||
return result
|
|
||||||
|
|
||||||
def get_signed_wrapped_rpms_paths(self, task_id, sigkey, srpm=False):
|
|
||||||
result = []
|
|
||||||
parent_task = self.koji_proxy.getTaskInfo(task_id, request=True)
|
|
||||||
task_info_list = []
|
|
||||||
task_info_list.extend(self.koji_proxy.getTaskChildren(task_id, request=True))
|
|
||||||
|
|
||||||
# scan parent and child tasks for certain methods
|
|
||||||
task_info = None
|
|
||||||
for i in task_info_list:
|
|
||||||
if i["method"] in ("wrapperRPM"):
|
|
||||||
task_info = i
|
|
||||||
break
|
|
||||||
|
|
||||||
# Check parent_task if it's scratch build
|
|
||||||
scratch = parent_task["request"][-1].get("scratch", False)
|
|
||||||
if scratch:
|
|
||||||
raise RuntimeError("Scratch builds cannot be signed!")
|
|
||||||
|
|
||||||
# Get results of wrapperRPM task
|
|
||||||
# {'buildroot_id': 2479520,
|
|
||||||
# 'logs': ['checkout.log', 'root.log', 'state.log', 'build.log'],
|
|
||||||
# 'rpms': ['foreman-discovery-image-2.1.0-2.el7sat.noarch.rpm'],
|
|
||||||
# 'srpm': 'foreman-discovery-image-2.1.0-2.el7sat.src.rpm'}
|
|
||||||
task_result = self.koji_proxy.getTaskResult(task_info["id"])
|
|
||||||
|
|
||||||
# Get list of filenames that should be returned
|
|
||||||
result_files = task_result["rpms"]
|
|
||||||
if srpm:
|
|
||||||
result_files += [task_result["srpm"]]
|
|
||||||
|
|
||||||
# Prepare list with paths to the required files
|
|
||||||
for i in result_files:
|
|
||||||
rpminfo = self.koji_proxy.getRPM(i)
|
|
||||||
build = self.koji_proxy.getBuild(rpminfo["build_id"])
|
|
||||||
path = os.path.join(
|
|
||||||
self.koji_module.pathinfo.build(build),
|
|
||||||
self.koji_module.pathinfo.signed(rpminfo, sigkey),
|
|
||||||
)
|
|
||||||
result.append(path)
|
|
||||||
|
|
||||||
return result
|
|
||||||
|
|
||||||
def get_build_nvrs(self, task_id):
|
|
||||||
builds = self.koji_proxy.listBuilds(taskID=task_id)
|
|
||||||
return [build.get("nvr") for build in builds if build.get("nvr")]
|
|
||||||
|
|
||||||
def multicall_map(
|
def multicall_map(
|
||||||
self, koji_session, koji_session_fnc, list_of_args=None, list_of_kwargs=None
|
self, koji_session, koji_session_fnc, list_of_args=None, list_of_kwargs=None
|
||||||
):
|
):
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user