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

[ostree] Mount ostree directory in koji 

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2016-04-07 14:04:50 +02:00
parent 36e7279a5e
commit b7948f2d65
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pungi/phases/ostree.py
View File

@ -71,11 +71,12 @@ class OSTreeThread(WorkerThread):
packages = ['pungi', 'ostree', 'rpm-ostree'] packages = ['pungi', 'ostree', 'rpm-ostree']
log_file = os.path.join(self.logdir, 'runroot.log') log_file = os.path.join(self.logdir, 'runroot.log')
mounts = [compose.topdir, config['ostree_repo']]
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,
channel=runroot_channel, channel=runroot_channel,
use_shell=True, task_id=True, use_shell=True, task_id=True,
packages=packages, mounts=[compose.topdir]) packages=packages, mounts=mounts)
output = koji.run_runroot_cmd(koji_cmd, log_file=log_file) output = koji.run_runroot_cmd(koji_cmd, log_file=log_file)
if output["retcode"] != 0: if output["retcode"] != 0:
raise RuntimeError("Runroot task failed: %s. See %s for more details." raise RuntimeError("Runroot task failed: %s. See %s for more details."

2
tests/test_ostree_phase.py
View File

@ -109,7 +109,7 @@ class OSTreeThreadTest(helpers.PungiTestCase):
'--config-branch=f24', '--config-branch=f24',
'--source-repo={}/compose/Everything/x86_64/os'.format(self.topdir), '--source-repo={}/compose/Everything/x86_64/os'.format(self.topdir),
'/other/place/for/atomic'], '/other/place/for/atomic'],
channel=None, mounts=[self.topdir], channel=None, mounts=[self.topdir, '/other/place/for/atomic'],
packages=['pungi', 'ostree', 'rpm-ostree'], packages=['pungi', 'ostree', 'rpm-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,