particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

A stab at --new-chroot support for rhe runroot plugin

Browse source
This commit is contained in:
Ian McLeod 2016-09-27 23:19:51 -05:00 • committed by Mike McLean
parent acd1ed7876
commit 0273b77682
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cli/koji
View file

@ -6892,6 +6892,8 @@ def handle_runroot(options, session, args):
help=_("Print the ID of the runroot task"))
parser.add_option("--use-shell", action="store_true", default=False,
help=_("Run command through a shell, otherwise uses exec"))
parser.add_option("--new-chroot", action="store_true", default=False,
help=_("Run command with the --new-chroot (systemd-nspawn) option to mock"))
parser.add_option("--repo-id", type="int", help=_("ID of the repo to use"))
(opts, args) = parser.parse_args(args)
@ -6912,6 +6914,7 @@ def handle_runroot(options, session, args):
packages=opts.package, mounts=opts.mount,
repo_id=opts.repo_id,
skip_setarch=opts.skip_setarch,
new_chroot=opts.new_chroot,
weight=opts.weight)
except koji.GenericError, e:
if 'Invalid method' in str(e):

4
plugins/builder/runroot.py
View file

@ -92,7 +92,7 @@ class RunRootTask(tasks.BaseTaskHandler):
if not path.startswith('/'):
raise koji.GenericError("bad config: all paths (default_mounts, safe_roots, path_subs) needs to be absolute: %s" % path)
def handler(self, root, arch, command, keep=False, packages=[], mounts=[], repo_id=None, skip_setarch=False, weight=None, upload_logs=None):
def handler(self, root, arch, command, keep=False, packages=[], mounts=[], repo_id=None, skip_setarch=False, weight=None, upload_logs=None, new_chroot=False):
"""Create a buildroot and run a command (as root) inside of it
Command may be a string or a list.
@ -188,6 +188,8 @@ class RunRootTask(tasks.BaseTaskHandler):
self.do_mounts(rootdir, [self._get_path_params(x) for x in self.config['default_mounts']])
self.do_extra_mounts(rootdir, mounts)
mock_cmd = ['chroot']
if new_chroot:
mock_cmd.append('--new-chroot')
if skip_setarch:
#we can't really skip it, but we can set it to the current one instead of of the chroot one
myarch = platform.uname()[5]