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

ostree-installer: Capture all lorax logs

Browse Source 
Fixes: #457
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2016-11-09 09:00:33 +01:00
parent 9a72ea8f6d
commit 99ba369901
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pungi/phases/ostree_installer.py
View File

@ -153,6 +153,7 @@ class OstreeInstallerThread(WorkerThread):
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, is_final=compose.supported,
log_dir=self.logdir,
) )
runroot_channel = compose.conf.get("runroot_channel") runroot_channel = compose.conf.get("runroot_channel")

12
tests/test_ostree_installer_phase.py
View File

@ -138,7 +138,8 @@ class OstreeThreadTest(helpers.PungiTestCase):
self.assertRunrootCall(koji, self.assertRunrootCall(koji,
'file://%s/compose/Everything/x86_64/os' % self.topdir, 'file://%s/compose/Everything/x86_64/os' % self.topdir,
cfg['release']) cfg['release'],
extra=['--logfile=%s/logs/x86_64/ostree_installer/lorax.log' % self.topdir])
self.assertIsoLinked(link, get_file_size, get_mtime, final_iso_path) self.assertIsoLinked(link, get_file_size, get_mtime, final_iso_path)
self.assertImageAdded(self.compose, ImageCls, iso) self.assertImageAdded(self.compose, ImageCls, iso)
self.assertAllCopied(run) self.assertAllCopied(run)
@ -171,7 +172,8 @@ class OstreeThreadTest(helpers.PungiTestCase):
t.process((self.compose, self.compose.variants['Everything'], 'x86_64', cfg), 1) t.process((self.compose, self.compose.variants['Everything'], 'x86_64', cfg), 1)
self.assertRunrootCall(koji, 'http://example.com/repo/x86_64/', cfg['release'], isfinal=True) self.assertRunrootCall(koji, 'http://example.com/repo/x86_64/', cfg['release'], isfinal=True,
extra=['--logfile=%s/logs/x86_64/ostree_installer/lorax.log' % self.topdir])
self.assertIsoLinked(link, get_file_size, get_mtime, final_iso_path) self.assertIsoLinked(link, get_file_size, get_mtime, final_iso_path)
self.assertImageAdded(self.compose, ImageCls, iso) self.assertImageAdded(self.compose, ImageCls, iso)
self.assertAllCopied(run) self.assertAllCopied(run)
@ -252,7 +254,8 @@ class OstreeThreadTest(helpers.PungiTestCase):
cfg['release'], cfg['release'],
isfinal=True, isfinal=True,
extra=['--add-template=%s/some_file.txt' % templ_dir, extra=['--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,
'--logfile=%s/logs/x86_64/ostree_installer/lorax.log' % self.topdir])
self.assertIsoLinked(link, get_file_size, get_mtime, final_iso_path) self.assertIsoLinked(link, get_file_size, get_mtime, final_iso_path)
self.assertImageAdded(self.compose, ImageCls, iso) self.assertImageAdded(self.compose, ImageCls, iso)
self.assertAllCopied(run) self.assertAllCopied(run)
@ -309,7 +312,8 @@ class OstreeThreadTest(helpers.PungiTestCase):
'--add-template-var=ostree_ref=fedora-atomic/Rawhide/x86_64/docker-host', '--add-template-var=ostree_ref=fedora-atomic/Rawhide/x86_64/docker-host',
'--add-arch-template-var=ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/Rawhide/', '--add-arch-template-var=ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/Rawhide/',
'--add-arch-template-var=ostree_osname=fedora-atomic', '--add-arch-template-var=ostree_osname=fedora-atomic',
'--add-arch-template-var=ostree_ref=fedora-atomic/Rawhide/x86_64/docker-host'] '--add-arch-template-var=ostree_ref=fedora-atomic/Rawhide/x86_64/docker-host',
'--logfile=%s/logs/x86_64/ostree_installer/lorax.log' % self.topdir]
) )
self.assertIsoLinked(link, get_file_size, get_mtime, final_iso_path) self.assertIsoLinked(link, get_file_size, get_mtime, final_iso_path)
self.assertImageAdded(self.compose, ImageCls, iso) self.assertImageAdded(self.compose, ImageCls, iso)