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

Merge builder.py changes from master, pt2

Browse Source 
* 9c875ce Do not try to rebuild the module-build-macros when it already exists in buildroot.
* 7e57432 Use Koji multicall when tagging builds. Do not query Koji to get the status of builds which we are reusing from previous module build.
This commit is contained in:
Jakub Kadlčík
2017-04-06 23:17:05 +02:00
parent 469cbc8846
commit 35ff4a8aca
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module_build_service/builder/KojiModuleBuilder.py
View File

@@ -292,6 +292,7 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules
tagged_nvrs = self._get_tagged_nvrs(self.module_build_tag['name'])
self.koji_session.multicall = True
for nvr in artifacts:
if nvr in tagged_nvrs:
continue
@@ -306,18 +307,21 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules
name = kobo.rpmlib.parse_nvr(nvr)['name']
log.info("%r adding %s to group %s" % (self, name, group))
self.koji_session.groupPackageListAdd(build_tag, group, name)
self.koji_session.multiCall(strict=True)
def tag_artifacts(self, artifacts):
dest_tag = self._get_tag(self.module_tag)['id']
tagged_nvrs = self._get_tagged_nvrs(self.module_tag['name'])
self.koji_session.multicall = True
for nvr in artifacts:
if nvr in tagged_nvrs:
continue
log.info("%r tagging %r into %r" % (self, nvr, dest_tag))
self.koji_session.tagBuild(dest_tag, nvr)
self.koji_session.multiCall(strict=True)
def wait_task(self, task_id):
"""
@@ -354,7 +358,13 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules
# * we do want only build explicitly tagged in the module tag (inherit: False)
opts = {'latest': True, 'package': artifact_name, 'inherit': False}
tagged = self.koji_session.listTagged(self.module_tag['name'], **opts)
if artifact_name == "module-build-macros":
tag = self.module_build_tag['name']
else:
tag = self.module_tag['name']
tagged = self.koji_session.listTagged(tag, **opts)
if tagged:
assert len(tagged) == 1, "Expected exactly one item in list. Got %s" % tagged