diff --git a/roles/koji_hub/files/runroot_hub.py b/roles/koji_hub/files/runroot_hub.py deleted file mode 100644 index 8a81059c1e..0000000000 --- a/roles/koji_hub/files/runroot_hub.py +++ /dev/null @@ -1,66 +0,0 @@ -#koji hub plugin -# There is a kojid plugin that goes with this hub plugin. The kojid builder -# plugin has a config file. This hub plugin has no config file. - -# XXX -- MANAGED BY ANSIBLE. -# This was submitted to koji upstream, so we won't always need to install it -# ourselves with ansible once it is merged and released. -# https://lists.fedoraproject.org/pipermail/buildsys/2015-June/004780.html - - -from koji.context import context -from koji.plugin import export -import koji -import random -import sys - -#XXX - have to import kojihub for mktask -sys.path.insert(0, '/usr/share/koji-hub/') -from kojihub import mktask, get_tag, get_all_arches - -__all__ = ('runroot',) - - -def get_channel_arches(channel): - """determine arches available in channel""" - chan = context.handlers.call('getChannel', channel, strict=True) - ret = {} - for host in context.handlers.call('listHosts', channelID=chan['id'], enabled=True): - for a in host['arches'].split(): - ret[koji.canonArch(a)] = 1 - return ret - -@export -def runroot(tagInfo, arch, command, channel=None, **opts): - """ Create a runroot task """ - context.session.assertPerm('runroot') - taskopts = { - 'priority': 15, - 'arch': arch, - } - - taskopts['channel'] = channel or 'runroot' - - if arch == 'noarch': - #not all arches can generate a proper buildroot for all tags - tag = get_tag(tagInfo) - if not tag['arches']: - raise koji.GenericError, 'no arches defined for tag %s' % tag['name'] - - #get all known arches for the system - fullarches = get_all_arches() - - tagarches = tag['arches'].split() - - # If our tag can't do all arches, then we need to - # specify one of the arches it can do. - if set(fullarches) - set(tagarches): - chanarches = get_channel_arches(taskopts['channel']) - choices = [x for x in tagarches if x in chanarches] - if not choices: - raise koji.GenericError, 'no common arches for tag/channel: %s/%s' \ - % (tagInfo, taskopts['channel']) - taskopts['arch'] = koji.canonArch(random.choice(choices)) - - return mktask(taskopts,'runroot', tagInfo, arch, command, **opts) - diff --git a/roles/koji_hub/tasks/main.yml b/roles/koji_hub/tasks/main.yml index d0c8c7fe99..3befde1946 100644 --- a/roles/koji_hub/tasks/main.yml +++ b/roles/koji_hub/tasks/main.yml @@ -76,17 +76,6 @@ - config - koji_hub -# This was submitted to koji upstream, so we won't always need to install it -# ourselves this way once it is merged and released. -# https://lists.fedoraproject.org/pipermail/buildsys/2015-June/004780.html -- name: koji runroot hub plugin - copy: src=runroot_hub.py dest=/usr/lib/koji-hub-plugins/runroot_hub.py - notify: - - restart httpd - tags: - - config - - koji_hub - # # install production certs and keys #