- setup fedora config for kerberos and flag day Signed-off-by: Dennis Gilmore <dennis@ausil.us>epel9
Dennis Gilmore
8 years ago
parent
156b735749
commit
be89d2541e
@ -1,29 +0,0 @@
|
||||
From 6e224af9a8610f37898859d25efa7188e9f008e0 Mon Sep 17 00:00:00 2001
|
||||
From: Dennis Gilmore <dennis@ra.ausil.us>
|
||||
Date: Wed, 6 Apr 2016 15:00:13 -0500
|
||||
Subject: [PATCH] enable dns to work in runroot buildroots
|
||||
|
||||
Signed-off-by: Dennis Gilmore <dennis@ra.ausil.us>
|
||||
---
|
||||
plugins/builder/runroot.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/plugins/builder/runroot.py b/plugins/builder/runroot.py
|
||||
index b303890..7bf40e4 100644
|
||||
--- a/plugins/builder/runroot.py
|
||||
+++ b/plugins/builder/runroot.py
|
||||
@@ -152,9 +152,9 @@ class RunRootTask(tasks.BaseTaskHandler):
|
||||
parent=self.id)
|
||||
repo_info = self.wait(task_id)[task_id]
|
||||
if compat_mode:
|
||||
- broot = BuildRoot(root, br_arch, self.id, repo_id=repo_info['id'])
|
||||
+ broot = BuildRoot(root, br_arch, self.id, repo_id=repo_info['id'], setup_dns=True)
|
||||
else:
|
||||
- broot = BuildRoot(self.session, self.options, root, br_arch, self.id, repo_id=repo_info['id'])
|
||||
+ broot = BuildRoot(self.session, self.options, root, br_arch, self.id, repo_id=repo_info['id'], setup_dns=True)
|
||||
broot.workdir = self.workdir
|
||||
broot.init()
|
||||
rootdir = broot.rootdir()
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
From d70f068cc1e138b3bb58766728424c190fcd77b5 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Williamson <awilliam@redhat.com>
|
||||
Date: Aug 23 2016 04:50:22 +0000
|
||||
Subject: don't bind-mount /dev for LiveMediaTask (RHBZ #1315541)
|
||||
|
||||
|
||||
This is an alternative to https://pagure.io/koji/pull-request/137
|
||||
which keeps the /dev bind mount for ApplianceTask and LiveCDTask,
|
||||
only dropping it for LiveMediaTask. It seems from the test we
|
||||
ran that appliance-creator may still need it, at least for the
|
||||
present - some of the createAppliance tasks seemed to hang their
|
||||
builders.
|
||||
|
||||
---
|
||||
|
||||
diff --git a/builder/kojid b/builder/kojid
|
||||
index 05438d2..26ae8f2 100755
|
||||
--- a/builder/kojid
|
||||
+++ b/builder/kojid
|
||||
@@ -2483,6 +2483,9 @@ class BuildLiveMediaTask(BuildImageTask):
|
||||
# Other chroot-based image handlers should inherit this.
|
||||
class ImageTask(BaseTaskHandler):
|
||||
Methods = []
|
||||
+ # default to bind mounting /dev, but allow subclasses to change
|
||||
+ # this
|
||||
+ bind_opts = {'dirs' : {'/dev' : '/dev',}}
|
||||
|
||||
def makeImgBuildRoot(self, buildtag, repoinfo, arch, inst_group):
|
||||
"""
|
||||
@@ -2497,14 +2500,11 @@ class ImageTask(BaseTaskHandler):
|
||||
@returns: a buildroot object
|
||||
"""
|
||||
|
||||
- # Here we configure mock to bind mount a set of /dev directories
|
||||
- bind_opts = {'dirs' : {'/dev' : '/dev',}}
|
||||
- if os.path.exists('/selinux'):
|
||||
- bind_opts['dirs']['/selinux'] = '/selinux'
|
||||
rootopts = {'install_group': inst_group,
|
||||
'setup_dns': True,
|
||||
- 'repo_id': repoinfo['id'],
|
||||
- 'bind_opts' : bind_opts}
|
||||
+ 'repo_id': repoinfo['id']}
|
||||
+ if self.bind_opts:
|
||||
+ rootopts['bind_opts'] = self.bind_opts
|
||||
|
||||
broot = BuildRoot(self.session, self.options, buildtag, arch, self.id, **rootopts)
|
||||
broot.workdir = self.workdir
|
||||
@@ -2932,6 +2932,9 @@ class LiveMediaTask(ImageTask):
|
||||
|
||||
Methods = ['createLiveMedia']
|
||||
_taskWeight = 1.5
|
||||
+ # For livemedia-creator we do not want to bind mount /dev, see
|
||||
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1315541
|
||||
+ bind_opts = {}
|
||||
|
||||
def genISOManifest(self, image, manifile):
|
||||
"""
|
||||
|
||||
@ -1,91 +0,0 @@
|
||||
From 45b94423d4669547c3142bd38a1dff182101f15d Mon Sep 17 00:00:00 2001
|
||||
From: Ian McLeod <imcleod@redhat.com>
|
||||
Date: Sep 28 2016 04:19:51 +0000
|
||||
Subject: [PATCH 1/2] A stab at --new-chroot support for rhe runroot plugin
|
||||
|
||||
|
||||
---
|
||||
|
||||
diff --git a/cli/koji b/cli/koji
|
||||
index 4b5a23d..e33d1e4 100755
|
||||
--- a/cli/koji
|
||||
+++ b/cli/koji
|
||||
@@ -6853,6 +6853,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)
|
||||
@@ -6873,6 +6875,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):
|
||||
diff --git a/plugins/builder/runroot.py b/plugins/builder/runroot.py
|
||||
index 7bf40e4..83f1898 100644
|
||||
--- a/plugins/builder/runroot.py
|
||||
+++ b/plugins/builder/runroot.py
|
||||
@@ -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]
|
||||
|
||||
From 852f2500d45fa1aebbc2c0f2c568b026a3bf1ca5 Mon Sep 17 00:00:00 2001
|
||||
From: Ian McLeod <imcleod@redhat.com>
|
||||
Date: Sep 28 2016 18:23:42 +0000
|
||||
Subject: [PATCH 2/2] Slight improvement to new-chroot to make the cli change less likely to confuse older builders
|
||||
|
||||
|
||||
---
|
||||
|
||||
diff --git a/cli/koji b/cli/koji
|
||||
index e33d1e4..30e4f98 100755
|
||||
--- a/cli/koji
|
||||
+++ b/cli/koji
|
||||
@@ -6870,13 +6870,18 @@ def handle_runroot(options, session, args):
|
||||
else:
|
||||
command = args[2:]
|
||||
try:
|
||||
- task_id = session.runroot(tag, arch, command,
|
||||
- channel=opts.channel_override,
|
||||
- packages=opts.package, mounts=opts.mount,
|
||||
- repo_id=opts.repo_id,
|
||||
- skip_setarch=opts.skip_setarch,
|
||||
- new_chroot=opts.new_chroot,
|
||||
- weight=opts.weight)
|
||||
+ kwargs = { 'channel': opts.channel_override,
|
||||
+ 'packages': opts.package,
|
||||
+ 'mounts': opts.mount,
|
||||
+ 'repo_id': opts.repo_id,
|
||||
+ 'skip_setarch': opts.skip_setarch,
|
||||
+ 'weight': opts.weight }
|
||||
+ # Only pass this kwarg if it is true - this prevents confusing older
|
||||
+ # builders with a different function signature
|
||||
+ if opts.new_chroot:
|
||||
+ kwargs['new_chroot'] = True
|
||||
+
|
||||
+ task_id = session.runroot(tag, arch, command, **kwargs)
|
||||
except koji.GenericError, e:
|
||||
if 'Invalid method' in str(e):
|
||||
print "* The runroot plugin appears to not be installed on the",
|
||||
|
||||
Loading…
Reference in new issue