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

ostree_installer: Add --isfinal lorax argument

Browse Source 
If the compose is supported, we need to tell lorax to use the option.

Fixes: #399
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2016-09-21 13:48:51 +02:00
parent bfe1068b8e
commit 2ac45a783d
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pungi/phases/ostree_installer.py
View File

@ -149,7 +149,8 @@ class OstreeInstallerThread(WorkerThread):
add_template=self._get_templates(config, 'add_template'), add_template=self._get_templates(config, 'add_template'),
add_arch_template=self._get_templates(config, 'add_arch_template'), add_arch_template=self._get_templates(config, 'add_arch_template'),
add_template_var=config.get('add_template_var'), add_template_var=config.get('add_template_var'),
add_arch_template_var=config.get('add_arch_template_var') add_arch_template_var=config.get('add_arch_template_var'),
is_final=compose.supported,
) )
runroot_channel = compose.conf.get("runroot_channel") runroot_channel = compose.conf.get("runroot_channel")

4
tests/test_ostree_installer_phase.py
View File

@ -75,6 +75,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
'koji_profile': 'koji', 'koji_profile': 'koji',
'runroot_tag': 'rrt', 'runroot_tag': 'rrt',
}) })
compose.supported = False
pool = mock.Mock() pool = mock.Mock()
cfg = { cfg = {
'source_repo_from': 'Everything', 'source_repo_from': 'Everything',
@ -166,6 +167,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
'--source=http://example.com/repo/x86_64/', '--source=http://example.com/repo/x86_64/',
'--variant=Everything', '--variant=Everything',
'--nomacboot', '--nomacboot',
'--isfinal',
self.topdir + '/work/x86_64/Everything/ostree_installer'], self.topdir + '/work/x86_64/Everything/ostree_installer'],
channel=None, mounts=[self.topdir], channel=None, mounts=[self.topdir],
packages=['pungi', 'lorax', 'ostree'], packages=['pungi', 'lorax', 'ostree'],
@ -278,6 +280,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
'--source=file://%s/compose/Everything/x86_64/os' % self.topdir, '--source=file://%s/compose/Everything/x86_64/os' % self.topdir,
'--variant=Everything', '--variant=Everything',
'--nomacboot', '--nomacboot',
'--isfinal',
'--add-template=%s/some_file.txt' % templ_dir, '--add-template=%s/some_file.txt' % templ_dir,
'--add-arch-template=%s/other_file.txt' % templ_dir, '--add-arch-template=%s/other_file.txt' % templ_dir,
self.topdir + '/work/x86_64/Everything/ostree_installer'], self.topdir + '/work/x86_64/Everything/ostree_installer'],
@ -355,6 +358,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
'--source=file://%s/compose/Everything/x86_64/os' % self.topdir, '--source=file://%s/compose/Everything/x86_64/os' % self.topdir,
'--variant=Everything', '--variant=Everything',
'--nomacboot', '--nomacboot',
'--isfinal',
'--installpkgs=fedora-productimg-atomic', '--installpkgs=fedora-productimg-atomic',
'--add-template=/spin-kickstarts/atomic-installer/lorax-configure-repo.tmpl', '--add-template=/spin-kickstarts/atomic-installer/lorax-configure-repo.tmpl',
'--add-arch-template=/spin-kickstarts/atomic-installer/lorax-embed-repo.tmpl', '--add-arch-template=/spin-kickstarts/atomic-installer/lorax-embed-repo.tmpl',