almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Remove default runroot channel

Browse Source 
When the value is not specified in the configuration file, let Koji pick
the default channel.

JIRA: RHELBLD-8088
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2021-10-21 13:22:33 +02:00
parent b03490bf18
commit eb61c97cdb
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pungi/wrappers/kojiwrapper.py
View File

@ -115,8 +115,6 @@ class KojiWrapper(object):
if channel: if channel:
cmd.append("--channel-override=%s" % channel) cmd.append("--channel-override=%s" % channel)
else:
cmd.append("--channel-override=runroot-local")
if weight: if weight:
cmd.append("--weight=%s" % int(weight)) cmd.append("--weight=%s" % int(weight))
@ -172,8 +170,6 @@ class KojiWrapper(object):
if channel: if channel:
cmd.append("--channel-override=%s" % channel) cmd.append("--channel-override=%s" % channel)
else:
cmd.append("--channel-override=runroot-local")
if weight: if weight:
cmd.append("--weight=%s" % int(weight)) cmd.append("--weight=%s" % int(weight))
@ -222,8 +218,6 @@ class KojiWrapper(object):
if channel: if channel:
cmd.append("--channel-override=%s" % channel) cmd.append("--channel-override=%s" % channel)
else:
cmd.append("--channel-override=runroot-local")
if weight: if weight:
cmd.append("--weight=%s" % int(weight)) cmd.append("--weight=%s" % int(weight))

6
tests/test_koji_wrapper.py
View File

@ -533,7 +533,7 @@ class LiveImageKojiWrapperTest(KojiWrapperBaseTestCase):
class RunrootKojiWrapperTest(KojiWrapperBaseTestCase): class RunrootKojiWrapperTest(KojiWrapperBaseTestCase):
def test_get_cmd_minimal(self): def test_get_cmd_minimal(self):
cmd = self.koji.get_runroot_cmd("tgt", "s390x", "date", use_shell=False) cmd = self.koji.get_runroot_cmd("tgt", "s390x", "date", use_shell=False)
self.assertEqual(len(cmd), 9) self.assertEqual(len(cmd), 8)
self.assertEqual( self.assertEqual(
cmd[:5], cmd[:5],
["koji", "--profile=custom-koji", "runroot", "--nowait", "--task-id"], ["koji", "--profile=custom-koji", "runroot", "--nowait", "--task-id"],
@ -543,7 +543,7 @@ class RunrootKojiWrapperTest(KojiWrapperBaseTestCase):
self.assertEqual( self.assertEqual(
cmd[-1], "rm -f /var/lib/rpm/__db*; rm -rf /var/cache/yum/*; set -x; date" cmd[-1], "rm -f /var/lib/rpm/__db*; rm -rf /var/cache/yum/*; set -x; date"
) )
six.assertCountEqual(self, cmd[5:-3], ["--channel-override=runroot-local"]) six.assertCountEqual(self, cmd[5:-3], [])
def test_get_cmd_full(self): def test_get_cmd_full(self):
cmd = self.koji.get_runroot_cmd( cmd = self.koji.get_runroot_cmd(
@ -1023,7 +1023,6 @@ class RunBlockingCmdTest(KojiWrapperBaseTestCase):
"pungi-buildinstall", "pungi-buildinstall",
"--nowait", "--nowait",
"--task-id", "--task-id",
"--channel-override=runroot-local",
"--weight=123", "--weight=123",
"--package=lorax", "--package=lorax",
"--mount=/tmp", "--mount=/tmp",
@ -1052,7 +1051,6 @@ class RunBlockingCmdTest(KojiWrapperBaseTestCase):
"pungi-ostree", "pungi-ostree",
"--nowait", "--nowait",
"--task-id", "--task-id",
"--channel-override=runroot-local",
"--weight=123", "--weight=123",
"--package=lorax", "--package=lorax",
"--mount=/tmp", "--mount=/tmp",