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

[live-media] Koji option is ksfile, not kickstart

Browse Source 
In config, it is still called kickstart to be consistent with how
image-build calls it.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2016-02-11 10:39:32 +01:00
parent 6ec151cde2
commit ac29bf05ee
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pungi/phases/livemedia_phase.py
View File

@ -87,7 +87,7 @@ class LiveMediaPhase(PhaseBase):
config = { config = {
'target': image_conf['target'], 'target': image_conf['target'],
'arches': self._get_arches(image_conf, arches), 'arches': self._get_arches(image_conf, arches),
'kickstart': image_conf['kickstart'], 'ksfile': image_conf['kickstart'],
'ksurl': resolve_git_url(image_conf['ksurl']), 'ksurl': resolve_git_url(image_conf['ksurl']),
'ksversion': image_conf.get('ksversion'), 'ksversion': image_conf.get('ksversion'),
'scratch': image_conf.get('scratch', False), 'scratch': image_conf.get('scratch', False),

12
tests/test_livemediaphase.py
View File

@ -89,7 +89,7 @@ class TestLiveMediaPhase(unittest.TestCase):
compose.variants['Server'], compose.variants['Server'],
{ {
'arches': ['amd64', 'x86_64'], 'arches': ['amd64', 'x86_64'],
'kickstart': 'file.ks', 'ksfile': 'file.ks',
'ksurl': 'git://example.com/repo.git', 'ksurl': 'git://example.com/repo.git',
'ksversion': None, 'ksversion': None,
'name': 'Fedora Server Live', 'name': 'Fedora Server Live',
@ -186,7 +186,7 @@ class TestLiveMediaPhase(unittest.TestCase):
compose.variants['Server'], compose.variants['Server'],
{ {
'arches': ['x86_64'], 'arches': ['x86_64'],
'kickstart': 'file.ks', 'ksfile': 'file.ks',
'ksurl': 'resolved', 'ksurl': 'resolved',
'ksversion': '24', 'ksversion': '24',
'name': 'Fedora Server Live', 'name': 'Fedora Server Live',
@ -214,7 +214,7 @@ class TestCreateImageBuildThread(unittest.TestCase):
}) })
config = { config = {
'arches': ['amd64', 'x86_64'], 'arches': ['amd64', 'x86_64'],
'kickstart': 'file.ks', 'ksfile': 'file.ks',
'ksurl': 'git://example.com/repo.git', 'ksurl': 'git://example.com/repo.git',
'ksversion': None, 'ksversion': None,
'name': 'Fedora Server Live', 'name': 'Fedora Server Live',
@ -264,7 +264,7 @@ class TestCreateImageBuildThread(unittest.TestCase):
[mock.call('koji-spin-livemedia', log_file='/a/b/log/log_file')]) [mock.call('koji-spin-livemedia', log_file='/a/b/log/log_file')])
self.assertEqual(get_live_media_cmd.mock_calls, self.assertEqual(get_live_media_cmd.mock_calls,
[mock.call({'arch': 'amd64,x86_64', [mock.call({'arch': 'amd64,x86_64',
'kickstart': 'file.ks', 'ksfile': 'file.ks',
'ksurl': 'git://example.com/repo.git', 'ksurl': 'git://example.com/repo.git',
'ksversion': None, 'ksversion': None,
'name': 'Fedora Server Live', 'name': 'Fedora Server Live',
@ -315,7 +315,7 @@ class TestCreateImageBuildThread(unittest.TestCase):
}) })
config = { config = {
'arches': ['amd64', 'x86_64'], 'arches': ['amd64', 'x86_64'],
'kickstart': 'file.ks', 'ksfile': 'file.ks',
'ksurl': 'git://example.com/repo.git', 'ksurl': 'git://example.com/repo.git',
'ksversion': None, 'ksversion': None,
'name': 'Fedora Server Live', 'name': 'Fedora Server Live',
@ -354,7 +354,7 @@ class TestCreateImageBuildThread(unittest.TestCase):
}) })
config = { config = {
'arches': ['amd64', 'x86_64'], 'arches': ['amd64', 'x86_64'],
'kickstart': 'file.ks', 'ksfile': 'file.ks',
'ksurl': 'git://example.com/repo.git', 'ksurl': 'git://example.com/repo.git',
'ksversion': None, 'ksversion': None,
'name': 'Fedora Server Live', 'name': 'Fedora Server Live',