particle-os/debian-koji-osbuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

plugin/builder: more generic upload_json method

Browse source 
Rename "upload_meta_data" to "upload_json" and re-use that method
from "attach_logs", removing the duplicated code there.
This commit is contained in:
Christian Kellner 2020-11-12 19:10:11 +01:00
parent 7cc225716c
commit 5d309bd86d
1 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

19
plugins/builder/osbuild.py
View file

@ -273,7 +273,7 @@ class OSBuildImage(BaseTaskHandler):
self.client.http.verify = val
self.logger.debug("ssl verify: %s", val)
def upload_meta_data(self, data: Dict, name: str):
def upload_json(self, data: Dict, name: str):
fd = io.StringIO()
json.dump(data, fd, indent=4, sort_keys=True)
fd.seek(0)
@ -296,18 +296,9 @@ class OSBuildImage(BaseTaskHandler):
ilogs = zip(logs.image_logs, ireqs)
for log, ireq in ilogs:
name = "%s-%s" % (ireq.architecture, ireq.image_type)
self.logger.debug("Uploading logs for %s", name)
fd = io.StringIO()
json.dump(log, fd, indent=4, sort_keys=True)
fd.seek(0)
path = koji.pathinfo.taskrelpath(self.id)
fast_incremental_upload(self.session,
name + ".log.json",
fd,
path,
3, # retries
self.logger)
name = "%s-%s.log" % (ireq.architecture, ireq.image_type)
self.logger.debug("Uploading logs: %s", name)
self.upload_json(log, name)
@staticmethod
def arches_for_config(buildconfig: Dict):
@ -392,7 +383,7 @@ class OSBuildImage(BaseTaskHandler):
kojidata = ComposeRequest.Koji(self.koji_url, self.id)
request = ComposeRequest(nvr, distro, ireqs, kojidata)
self.upload_meta_data(request.as_dict(), "compose-request")
self.upload_json(request.as_dict(), "compose-request")
cid, bid = client.compose_create(request)
self.logger.info("Compose id: %s, Koji build id: %s", cid, bid)