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

builder: create_compose takes a ComposeRequest obj

Browse source 
Instead of having the individual components for a compose request as
argument, make create_compose just take a ComposeRequest object.
This will pave the way to save the compose request as meta-data for
the task, which can be useful if something goes wrong, e.g. creating
the request.
This commit is contained in:
Christian Kellner 2020-09-18 14:50:58 +02:00
parent 521bee4700
commit d0499f4ef4
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/builder/osbuild.py
View file

@ -171,11 +171,11 @@ class Client:
return certs
def compose_create(self, nvr: NVR, distro: str, images: List[ImageRequest], kojidata: ComposeRequest.Koji):
def compose_create(self, compose_request: ComposeRequest):
url = urllib.parse.urljoin(self.url, f"/compose")
cro = ComposeRequest(nvr, distro, images, kojidata)
res = self.http.post(url, json=cro.as_dict())
data = compose_request.as_dict()
res = self.http.post(url, json=data)
if res.status_code != 201:
body = res.content.decode("utf-8").strip()
@ -311,9 +311,10 @@ class OSBuildImage(BaseTaskHandler):
nvr, distro, self.koji_url,
str([i.as_dict() for i in ireqs]))
# Setup down, talk to composer to create the compose
# Setup done, create the compose request and send it off
kojidata = ComposeRequest.Koji(self.koji_url, self.id)
cid, bid = client.compose_create(nvr, distro, ireqs, kojidata)
request = ComposeRequest(nvr, distro, ireqs, kojidata)
cid, bid = client.compose_create(request)
self.logger.info("Compose id: %s, Koji build id: %s", cid, bid)
self.logger.debug("Waiting for comose to finish")
@ -363,7 +364,8 @@ def compose_cmd(client: Client, args):
images.append(ireq)
kojidata = ComposeRequest.Koji(args.koji, 0)
cid, bid = client.compose_create(nvr, args.distro, images, kojidata)
request = ComposeRequest(nvr, args.distro, images, kojidata)
cid, bid = client.compose_create(request)
print(f"Compose: {cid} [koji build id: {bid}]")
while True: