almalinux/pungi
15
2
Fork 0
Code Issues Pull Requests Releases Activity

[live-media] Respect release set in configuration

Browse Source 
Apparently just processing the config is not sufficient we don't pass
the value to Koji.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2016-02-22 08:32:27 +01:00
parent 32a966fc91
commit ec03a8685a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pungi/wrappers/kojiwrapper.py
View File

@ -157,6 +157,9 @@ class KojiWrapper(object):
if 'ksurl' in options: if 'ksurl' in options:
cmd.append('--ksurl=%s' % options['ksurl']) cmd.append('--ksurl=%s' % options['ksurl'])
if 'release' in options:
cmd.append('--release=%s' % options['release'])
if wait: if wait:
cmd.append('--wait') cmd.append('--wait')

4
tests/test_koji_wrapper.py
View File

@ -275,7 +275,7 @@ class LiveMediaTestCase(KojiWrapperBaseTestCase):
'name': 'name', 'version': '1', 'target': 'tgt', 'arch': 'x,y,z', 'name': 'name', 'version': '1', 'target': 'tgt', 'arch': 'x,y,z',
'ksfile': 'kickstart', 'install_tree': '/mnt/os', 'scratch': True, 'ksfile': 'kickstart', 'install_tree': '/mnt/os', 'scratch': True,
'repo': ['repo-1', 'repo-2'], 'skip_tag': True, 'repo': ['repo-1', 'repo-2'], 'skip_tag': True,
'ksurl': 'git://example.com/ksurl.git', 'ksurl': 'git://example.com/ksurl.git', 'release': '20160222.1',
} }
cmd = self.koji.get_live_media_cmd(opts) cmd = self.koji.get_live_media_cmd(opts)
self.assertEqual(cmd[:8], self.assertEqual(cmd[:8],
@ -283,7 +283,7 @@ class LiveMediaTestCase(KojiWrapperBaseTestCase):
'--install-tree=/mnt/os']) '--install-tree=/mnt/os'])
self.assertItemsEqual(cmd[8:], 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']) '--ksurl=git://example.com/ksurl.git', '--release=20160222.1'])
class LiveImageKojiWrapperTest(KojiWrapperBaseTestCase): class LiveImageKojiWrapperTest(KojiWrapperBaseTestCase):