modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-04-09 13:49:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix double tagging on module builds that have all their components reused

Browse Source
This commit is contained in:
mprahl
2017-11-28 09:50:35 -05:00
parent d5d0f02ca9
commit 5e9d846872
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
module_build_service/utils.py
View File

@@ -1157,7 +1157,6 @@ def attempt_to_reuse_all_components(builder, session, module):
# Tag them
builder.buildroot_add_artifacts(components_to_tag, install=False)
builder.tag_artifacts(components_to_tag, dest_tag=False)
builder.tag_artifacts(components_to_tag, dest_tag=True)
return True

24
tests/test_build/test_build.py
View File

@@ -154,7 +154,16 @@ class FakeModuleBuilder(GenericBuilder):
def buildroot_add_artifacts(self, artifacts, install=False):
if FakeModuleBuilder.on_buildroot_add_artifacts_cb:
FakeModuleBuilder.on_buildroot_add_artifacts_cb(self, artifacts, install)
self._send_repo_done()
if self.backend == 'test':
for nvr in artifacts:
# buildroot_add_artifacts received a list of NVRs, but the tag message expects the
# component name. At this point, the NVR may not be set if we are trying to reuse
# all components, so we can't search the database. We must parse the package name
# from the nvr and then tag it in the build tag.
nvr_dict = kobo.rpmlib.parse_nvr(nvr)
self._send_tag(nvr_dict['name'], dest_tag=False)
elif self.backend == 'testlocal':
self._send_repo_done()
def buildroot_add_repos(self, dependencies):
pass
@@ -163,11 +172,12 @@ class FakeModuleBuilder(GenericBuilder):
if FakeModuleBuilder.on_tag_artifacts_cb:
FakeModuleBuilder.on_tag_artifacts_cb(self, artifacts, dest_tag=dest_tag)
for nvr in artifacts:
# tag_artifacts received a list of NVRs, but the tag message expects the
# component name
artifact = models.ComponentBuild.query.filter_by(nvr=nvr).one().package
self._send_tag(artifact, dest_tag=dest_tag)
if self.backend == 'test':
for nvr in artifacts:
# tag_artifacts received a list of NVRs, but the tag message expects the
# component name
artifact = models.ComponentBuild.query.filter_by(nvr=nvr).one().package
self._send_tag(artifact, dest_tag=dest_tag)
@property
def koji_session(self):
@@ -228,7 +238,7 @@ class FakeModuleBuilder(GenericBuilder):
koji.BUILD_STATES[FakeModuleBuilder.BUILD_STATE], source,
FakeModuleBuilder._build_id)
if FakeModuleBuilder.BUILD_STATE == 'COMPLETE':
if self.backend == 'test' and FakeModuleBuilder.BUILD_STATE == 'COMPLETE':
# Tag the build in the -build tag
self._send_tag(artifact_name, dest_tag=False)