modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-04-02 10:20:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

use module owner for whitelisting Koji packages

Browse Source
This commit is contained in:
Filip Valder
2017-03-31 15:18:48 +02:00
parent 80f78c7e2e
commit 6412a7fc0f
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
module_build_service/builder.py
View File

@@ -853,20 +853,21 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules
return self._get_tag(tag_name) # Return up2date taginfo return self._get_tag(tag_name) # Return up2date taginfo
def _get_logged_in_user(self): def _get_logged_in_user(self):
"""
:return str or None (raise ValueError)
Get username of logged in user in the current Koji session.
"""
user = self.koji_session.getLoggedInUser()['name'] user = self.koji_session.getLoggedInUser()['name']
if not self.koji_session.getUser(user): if not self.koji_session.getUser(user):
raise ValueError("Unknown user %s" % user) raise ValueError("Unknown user %s" % user)
return user return user
def _koji_whitelist_packages(self, packages, tags = None): def _koji_whitelist_packages(self, packages, tags=None):
if not tags: if not tags:
tags = [self.module_tag, self.module_build_tag] tags = [self.module_tag, self.module_build_tag]
# TODO: This has to be done per-package or just without the need
# to pass the `packages` to it depending on the result of
# issue #337.
owner = self._get_component_owner(packages[0])
# This will help with potential resubmiting of failed builds # This will help with potential resubmiting of failed builds
pkglists = {} pkglists = {}
for tag in tags: for tag in tags:
@@ -875,13 +876,12 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules
self.koji_session.multicall = True self.koji_session.multicall = True
for tag in tags: for tag in tags:
pkglist = pkglists[tag['id']] pkglist = pkglists[tag['id']]
to_add = []
for package in packages: for package in packages:
if pkglist.get(package, None): if pkglist.get(package, None):
log.debug("%s Package %s is already whitelisted." % (self, package)) log.debug("%s Package %s is already whitelisted." % (self, package))
continue continue
self.koji_session.packageListAdd(tag['name'], package, owner) self.koji_session.packageListAdd(tag['name'], package, self.owner)
self.koji_session.multiCall(strict=True) self.koji_session.multiCall(strict=True)
@module_build_service.utils.validate_koji_tag(['build_tag', 'dest_tag']) @module_build_service.utils.validate_koji_tag(['build_tag', 'dest_tag'])