From 93015d679c6ada6c965f2744ee2f2ff19fdcc643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Thu, 11 Feb 2016 17:09:30 +0100 Subject: [PATCH] [live-media] Pass ksurl to koji MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lubomír Sedlář --- pungi/wrappers/kojiwrapper.py | 3 +++ tests/test_koji_wrapper.py | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pungi/wrappers/kojiwrapper.py b/pungi/wrappers/kojiwrapper.py index 5b769f19..15b12cb6 100644 --- a/pungi/wrappers/kojiwrapper.py +++ b/pungi/wrappers/kojiwrapper.py @@ -147,6 +147,9 @@ class KojiWrapper(object): if options.get('skip_tag'): cmd.append('--skip-tag') + if 'ksurl' in options: + cmd.append('--ksurl=%s' % pipes.quote(options['ksurl'])) + if wait: cmd.append('--wait') diff --git a/tests/test_koji_wrapper.py b/tests/test_koji_wrapper.py index 6c3e8d66..df6d867f 100755 --- a/tests/test_koji_wrapper.py +++ b/tests/test_koji_wrapper.py @@ -275,13 +275,15 @@ class LiveMediaTestCase(KojiWrapperBaseTestCase): 'name': 'name', 'version': '1', 'target': 'tgt', 'arch': 'x,y,z', 'ksfile': 'kickstart', 'install_tree': '/mnt/os', 'scratch': True, 'repo': ['repo-1', 'repo-2'], 'skip_tag': True, + 'ksurl': 'git://example.com/ksurl.git', } cmd = self.koji.get_live_media_cmd(opts) self.assertEqual(cmd[:8], ['koji', 'spin-livemedia', 'name', '1', 'tgt', 'x,y,z', 'kickstart', '--install-tree=/mnt/os']) self.assertItemsEqual(cmd[8:], - ['--repo=repo-1', '--repo=repo-2', '--skip-tag', '--scratch', '--wait']) + ['--repo=repo-1', '--repo=repo-2', '--skip-tag', '--scratch', '--wait', + '--ksurl=git://example.com/ksurl.git']) class LiveImageKojiWrapperTest(KojiWrapperBaseTestCase):