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

plugin/builder: global constants for default urls

Browse source 
Use a global constant for the composer and kojib hub URLs instead
of defining them in the source twice.
This commit is contained in:
Christian Kellner 2020-09-15 20:53:08 +02:00
parent 1ee0d80538
commit d4b5cae604
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/builder/osbuild.py
View file

@ -31,6 +31,10 @@ import koji
from koji.tasks import BaseTaskHandler from koji.tasks import BaseTaskHandler
DEFAULT_COMPOSER_URL = "http://localhost:8701/"
DEFAULT_KOJIHUB_URL = "https://localhost/kojihub"
# The following classes are a implementation of osbuild composer's # The following classes are a implementation of osbuild composer's
# koji API. It is based on the corresponding OpenAPI specification # koji API. It is based on the corresponding OpenAPI specification
# version '1' and should model it closely. # version '1' and should model it closely.
@ -209,8 +213,8 @@ class OSBuildImage(BaseTaskHandler):
cfg = configparser.ConfigParser() cfg = configparser.ConfigParser()
cfg.read_dict({ cfg.read_dict({
"composer": {"url": "http://localhost:8701/"}, "composer": {"url": DEFAULT_COMPOSER_URL},
"koji": {"url": "https://localhost/kojihub"} "koji": {"url": DEFAULT_KOJIHUB_URL}
}) })
cfg.read([ cfg.read([
@ -363,7 +367,7 @@ def main():
parser = argparse.ArgumentParser(description="osbuild composer koji API client") parser = argparse.ArgumentParser(description="osbuild composer koji API client")
parser.add_argument("--url", metavar="URL", type=str, parser.add_argument("--url", metavar="URL", type=str,
default="http://localhost:8701/", default=DEFAULT_COMPOSER_URL,
help="The URL of the osbuild composer koji API endpoint") help="The URL of the osbuild composer koji API endpoint")
parser.set_defaults(cmd=None) parser.set_defaults(cmd=None)
sp = parser.add_subparsers(help='commands') sp = parser.add_subparsers(help='commands')
@ -380,7 +384,7 @@ def main():
subpar.add_argument("--format", metavar="FORMAT", help='Request the image format [qcow2]', subpar.add_argument("--format", metavar="FORMAT", help='Request the image format [qcow2]',
action="append", type=str, default=[]) action="append", type=str, default=[])
subpar.add_argument("--koji", metavar="URL", help='The koji url', subpar.add_argument("--koji", metavar="URL", help='The koji url',
default="https://localhost/kojihub") default=DEFAULT_KOJIHUB_URL)
subpar.set_defaults(cmd='compose') subpar.set_defaults(cmd='compose')
subpar = sp.add_parser("status", help='status of a compose') subpar = sp.add_parser("status", help='status of a compose')