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

builder: use 'server' instead of 'url' for config

Browse source 
Mostly to be more in line with how things are called in all other
koji configuration files.
This commit is contained in:
Christian Kellner 2020-09-26 10:55:52 +02:00 • committed by Tom Gundersen
parent 1b8277c078
commit 7ecf7447e4
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
container/builder/osbuild-koji.conf
View file

@ -1,7 +1,7 @@
[composer] [composer]
url = https://composer/ server = https://composer/
ssl_cert = /share/worker-crt.pem, /share/worker-key.pem ssl_cert = /share/worker-crt.pem, /share/worker-key.pem
ssl_verify = /share/worker-ca.pem ssl_verify = /share/worker-ca.pem
[koji] [koji]
url = https://localhost:4343/kojihub/ server = https://localhost:4343/kojihub/

8
plugins/builder/osbuild.py
View file

@ -221,14 +221,14 @@ class OSBuildImage(BaseTaskHandler):
cfg = configparser.ConfigParser() cfg = configparser.ConfigParser()
cfg.read_dict({ cfg.read_dict({
"composer": {"url": DEFAULT_COMPOSER_URL}, "composer": {"server": DEFAULT_COMPOSER_URL},
"koji": {"url": DEFAULT_KOJIHUB_URL} "koji": {"server": DEFAULT_KOJIHUB_URL}
}) })
cfg.read(DEFAULT_CONFIG_FILES) cfg.read(DEFAULT_CONFIG_FILES)
self.composer_url = cfg["composer"]["url"] self.composer_url = cfg["composer"]["server"]
self.koji_url = cfg["koji"]["url"] self.koji_url = cfg["koji"]["server"]
self.client = Client(self.composer_url) self.client = Client(self.composer_url)
self.logger.debug("composer: %s", self.composer_url) self.logger.debug("composer: %s", self.composer_url)

4
test/unit/test_builder.py
View file

@ -267,12 +267,12 @@ class TestBuilderPlugin(PluginTest):
cfg = configparser.ConfigParser() cfg = configparser.ConfigParser()
cfg["composer"] = { cfg["composer"] = {
"url": composer_url, "server": composer_url,
"ssl_cert": ssl_cert, "ssl_cert": ssl_cert,
"ssl_verify": ssl_verify "ssl_verify": ssl_verify
} }
cfg["koji"] = { cfg["koji"] = {
"url": koji_url "server": koji_url
} }
cfgfile = os.path.abspath(os.path.join(tmp, "ko.cfg")) cfgfile = os.path.abspath(os.path.join(tmp, "ko.cfg"))