modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-06-14 22:17:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Have new tags inherit from 'module-package-list' and remove the 'force' parameter when tagging a build

Browse Source
This commit is contained in:
Matt Prahl
2017-02-28 12:38:48 -05:00
parent 6dd223fd12
commit 6ff2c19b60
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module_build_service/builder.py
View File

@@ -534,7 +534,7 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules
for nvr in artifacts: for nvr in artifacts:
log.info("%r tagging %r into %r" % (self, nvr, build_tag)) log.info("%r tagging %r into %r" % (self, nvr, build_tag))
self.koji_session.tagBuild(build_tag, nvr, force=True) self.koji_session.tagBuild(build_tag, nvr)
if not install: if not install:
continue continue
@@ -549,7 +549,7 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules
for nvr in artifacts: for nvr in artifacts:
log.info("%r tagging %r into %r" % (self, nvr, dest_tag)) log.info("%r tagging %r into %r" % (self, nvr, dest_tag))
self.koji_session.tagBuild(dest_tag, nvr, force=True) self.koji_session.tagBuild(dest_tag, nvr)
def wait_task(self, task_id): def wait_task(self, task_id):
""" """
@@ -768,8 +768,9 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules
log.debug("Ensuring existence of tag='%s'." % tag_name) log.debug("Ensuring existence of tag='%s'." % tag_name)
taginfo = self.koji_session.getTag(tag_name) taginfo = self.koji_session.getTag(tag_name)
if not taginfo: # Existing tag, need to check whether settings is correct if not taginfo:
self.koji_session.createTag(tag_name, {}) self.koji_session.createTag(
tag_name, parent=conf.koji_tag_inherit_from)
taginfo = self._get_tag(tag_name) taginfo = self._get_tag(tag_name)
opts = {} opts = {}

4
module_build_service/config.py
View File

@@ -163,6 +163,10 @@ class Config(object):
'type': str, 'type': str,
'default': '', 'default': '',
'desc': 'Target to build "module-build-macros" RPM in.'}, 'desc': 'Target to build "module-build-macros" RPM in.'},
'koji_tag_inherit_from': {
'type': str,
'default': 'module-package-list',
'desc': 'Tag that new module tags inherit from.'},
'koji_tag_prefixes': { 'koji_tag_prefixes': {
'type': list, 'type': list,
'default': ['module'], 'default': ['module'],