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

[ostree-installer] Use separate directory for logs

Browse Source 
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2016-04-08 10:58:46 +02:00
parent 09222a87a0
commit 8799d4cd85
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pungi/phases/ostree_installer.py
View File

@ -46,7 +46,7 @@ class OstreeInstallerThread(WorkerThread):
def worker(self, compose, variant, arch, config):
msg = 'Ostree phase for variant %s, arch %s' % (variant.uid, arch)
self.pool.log_info('[BEGIN] %s' % msg)
self.logdir = compose.paths.log.topdir('{}/ostree'.format(arch))
self.logdir = compose.paths.log.topdir('{}/ostree_installer'.format(arch))
source_variant = compose.variants[config['source_repo_from']]
source_repo = translate_path(

6
tests/test_ostree_installer_phase.py
View File

@ -149,7 +149,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
task_id=True, use_shell=True)])
self.assertEqual(koji.run_runroot_cmd.call_args_list,
[mock.call(koji.get_runroot_cmd.return_value,
log_file=self.topdir + '/logs/x86_64/ostree/runroot.log')])
log_file=self.topdir + '/logs/x86_64/ostree_installer/runroot.log')])
self.assertEqual(link.call_args_list,
[mock.call(self.topdir + '/work/x86_64/Everything/ostree_installer/images/boot.iso',
final_iso_path)])
@ -230,7 +230,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
task_id=True, use_shell=True)])
self.assertEqual(koji.run_runroot_cmd.call_args_list,
[mock.call(koji.get_runroot_cmd.return_value,
log_file=self.topdir + '/logs/x86_64/ostree/runroot.log')])
log_file=self.topdir + '/logs/x86_64/ostree_installer/runroot.log')])
self.assertEqual(link.call_args_list,
[mock.call(self.topdir + '/work/x86_64/Everything/ostree_installer/images/boot.iso',
final_iso_path)])
@ -310,7 +310,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
t.process((compose, compose.variants['Everything'], 'x86_64', cfg), 1)
compose.log_info.assert_has_calls([
mock.call('[FAIL] Ostree installer (variant Everything, arch x86_64) failed, but going on anyway.'),
mock.call('Runroot task failed: 1234. See %s/logs/x86_64/ostree/runroot.log for more details.'
mock.call('Runroot task failed: 1234. See %s/logs/x86_64/ostree_installer/runroot.log for more details.'
% self.topdir)
])