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

[ostree-installer] Install ostree in runroot

Browse Source 
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2016-04-12 12:45:28 +02:00
parent 31d922692f
commit ad32b73918
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

@ -149,7 +149,7 @@ class OstreeInstallerThread(WorkerThread):
runroot_channel = compose.conf.get("runroot_channel", None) runroot_channel = compose.conf.get("runroot_channel", None)
runroot_tag = compose.conf["runroot_tag"] runroot_tag = compose.conf["runroot_tag"]
packages = ['pungi', 'lorax'] packages = ['pungi', 'lorax', 'ostree']
log_file = os.path.join(self.logdir, 'runroot.log') log_file = os.path.join(self.logdir, 'runroot.log')
koji = kojiwrapper.KojiWrapper(compose.conf["koji_profile"]) koji = kojiwrapper.KojiWrapper(compose.conf["koji_profile"])
koji_cmd = koji.get_runroot_cmd(runroot_tag, arch, cmd, koji_cmd = koji.get_runroot_cmd(runroot_tag, arch, cmd,

6
tests/test_ostree_installer_phase.py
View File

@ -146,7 +146,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
'--nomacboot', '--nomacboot',
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'], packages=['pungi', 'lorax', 'ostree'],
task_id=True, use_shell=True)]) task_id=True, use_shell=True)])
self.assertEqual(koji.run_runroot_cmd.call_args_list, self.assertEqual(koji.run_runroot_cmd.call_args_list,
[mock.call(koji.get_runroot_cmd.return_value, [mock.call(koji.get_runroot_cmd.return_value,
@ -263,7 +263,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
'--add-arch-template={}/other_file.txt'.format(templ_dir), '--add-arch-template={}/other_file.txt'.format(templ_dir),
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'], packages=['pungi', 'lorax', 'ostree'],
task_id=True, use_shell=True)]) task_id=True, use_shell=True)])
self.assertEqual(koji.run_runroot_cmd.call_args_list, self.assertEqual(koji.run_runroot_cmd.call_args_list,
[mock.call(koji.get_runroot_cmd.return_value, [mock.call(koji.get_runroot_cmd.return_value,
@ -347,7 +347,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
'--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',
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'], packages=['pungi', 'lorax', 'ostree'],
task_id=True, use_shell=True)]) task_id=True, use_shell=True)])
self.assertEqual(koji.run_runroot_cmd.call_args_list, self.assertEqual(koji.run_runroot_cmd.call_args_list,
[mock.call(koji.get_runroot_cmd.return_value, [mock.call(koji.get_runroot_cmd.return_value,