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

buildinstall: Make output world readable

Browse Source 
This makes it possible to run a compose as non-root user, plus removes
the need for workarounds to publish the results directly.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2018-07-13 09:27:11 +02:00
parent 60917fdc77
commit 23c454ff67
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pungi/phases/buildinstall.py
View File

@ -465,7 +465,9 @@ class BuildinstallThread(WorkerThread):
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=[compose.topdir],
weight=compose.conf['runroot_weights'].get('buildinstall')) weight=compose.conf['runroot_weights'].get('buildinstall'),
destdir=output_dir,
)
# avoid race conditions? # avoid race conditions?
# Kerberos authentication failed: Permission denied in replay cache code (-1765328215) # Kerberos authentication failed: Permission denied in replay cache code (-1765328215)

21
tests/test_buildinstall.py
View File

@ -745,9 +745,12 @@ class BuildinstallThreadTestCase(PungiTestCase):
self.assertItemsEqual( self.assertItemsEqual(
get_runroot_cmd.mock_calls, get_runroot_cmd.mock_calls,
[mock.call('rrt', 'x86_64', self.cmd, channel=None, [mock.call(
'rrt', 'x86_64', self.cmd, channel=None,
use_shell=True, task_id=True, use_shell=True, task_id=True,
packages=['lorax'], mounts=[self.topdir], weight=123)]) packages=['lorax'], mounts=[self.topdir], weight=123,
destdir=os.path.join(self.topdir, "work/x86_64/buildinstall/Server"),
)])
self.assertItemsEqual( self.assertItemsEqual(
run_runroot_cmd.mock_calls, run_runroot_cmd.mock_calls,
[mock.call(get_runroot_cmd.return_value, [mock.call(get_runroot_cmd.return_value,
@ -786,9 +789,12 @@ class BuildinstallThreadTestCase(PungiTestCase):
self.assertItemsEqual( self.assertItemsEqual(
get_runroot_cmd.mock_calls, get_runroot_cmd.mock_calls,
[mock.call('rrt', 'x86_64', self.cmd, channel=None, [mock.call(
'rrt', 'x86_64', self.cmd, channel=None,
use_shell=True, task_id=True, use_shell=True, task_id=True,
packages=['anaconda'], mounts=[self.topdir], weight=None)]) packages=['anaconda'], mounts=[self.topdir], weight=None,
destdir=os.path.join(self.topdir, "work/x86_64/buildinstall"),
)])
self.assertItemsEqual( self.assertItemsEqual(
run_runroot_cmd.mock_calls, run_runroot_cmd.mock_calls,
[mock.call(get_runroot_cmd.return_value, [mock.call(get_runroot_cmd.return_value,
@ -929,9 +935,12 @@ class BuildinstallThreadTestCase(PungiTestCase):
self.assertItemsEqual( self.assertItemsEqual(
get_runroot_cmd.mock_calls, get_runroot_cmd.mock_calls,
[mock.call('rrt', 'x86_64', self.cmd, channel=None, [mock.call(
'rrt', 'x86_64', self.cmd, channel=None,
use_shell=True, task_id=True, use_shell=True, task_id=True,
packages=['lorax'], mounts=[self.topdir], weight=123)]) packages=['lorax'], mounts=[self.topdir], weight=123,
destdir="/buildinstall_topdir/buildinstall-%s/x86_64/Server" % os.path.basename(self.topdir),
)])
self.assertItemsEqual( self.assertItemsEqual(
run_runroot_cmd.mock_calls, run_runroot_cmd.mock_calls,
[mock.call(get_runroot_cmd.return_value, [mock.call(get_runroot_cmd.return_value,