diff --git a/pungi/wrappers/kojiwrapper.py b/pungi/wrappers/kojiwrapper.py index 1e67097f..140b2bfc 100644 --- a/pungi/wrappers/kojiwrapper.py +++ b/pungi/wrappers/kojiwrapper.py @@ -115,8 +115,6 @@ class KojiWrapper(object): if channel: cmd.append("--channel-override=%s" % channel) - else: - cmd.append("--channel-override=runroot-local") if weight: cmd.append("--weight=%s" % int(weight)) @@ -172,8 +170,6 @@ class KojiWrapper(object): if channel: cmd.append("--channel-override=%s" % channel) - else: - cmd.append("--channel-override=runroot-local") if weight: cmd.append("--weight=%s" % int(weight)) @@ -222,8 +218,6 @@ class KojiWrapper(object): if channel: cmd.append("--channel-override=%s" % channel) - else: - cmd.append("--channel-override=runroot-local") if weight: cmd.append("--weight=%s" % int(weight)) diff --git a/tests/test_koji_wrapper.py b/tests/test_koji_wrapper.py index 4c533fce..2a7c2df9 100644 --- a/tests/test_koji_wrapper.py +++ b/tests/test_koji_wrapper.py @@ -533,7 +533,7 @@ class LiveImageKojiWrapperTest(KojiWrapperBaseTestCase): class RunrootKojiWrapperTest(KojiWrapperBaseTestCase): def test_get_cmd_minimal(self): cmd = self.koji.get_runroot_cmd("tgt", "s390x", "date", use_shell=False) - self.assertEqual(len(cmd), 9) + self.assertEqual(len(cmd), 8) self.assertEqual( cmd[:5], ["koji", "--profile=custom-koji", "runroot", "--nowait", "--task-id"], @@ -543,7 +543,7 @@ class RunrootKojiWrapperTest(KojiWrapperBaseTestCase): self.assertEqual( 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): cmd = self.koji.get_runroot_cmd( @@ -1023,7 +1023,6 @@ class RunBlockingCmdTest(KojiWrapperBaseTestCase): "pungi-buildinstall", "--nowait", "--task-id", - "--channel-override=runroot-local", "--weight=123", "--package=lorax", "--mount=/tmp", @@ -1052,7 +1051,6 @@ class RunBlockingCmdTest(KojiWrapperBaseTestCase): "pungi-ostree", "--nowait", "--task-id", - "--channel-override=runroot-local", "--weight=123", "--package=lorax", "--mount=/tmp",