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

Merge #799 Fail module builds directly when a component build in a batch fails

Browse Source
This commit is contained in:
Matt Prahl
2017-11-17 16:39:40 +00:00
parent df5b9ab04a fa6f43e748
commit 88d655d099
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
module_build_service/scheduler/handlers/components.py
View File

@@ -98,18 +98,19 @@ def _finalize(config, session, msg, state):
builder = module_build_service.builder.GenericBuilder.create_from_module(
session, parent, config)
if not built_components_in_batch or failed_components_in_batch:
# If there are no successfully built components in a batch,
# there is nothing to tag. If there is some failed component build,
# we should not tag even the successfully built components, because
# the module build will fail anyway. Repository won't be
# regenerated in these cases and therefore we generate fake repo
if failed_components_in_batch:
log.info("Batch done, but not tagging because of failed component builds. Will "
"transition the module to \"failed\"")
parent.transition(config, state=models.BUILD_STATES['failed'],
state_reason="Some components failed to build.")
session.commit()
builder.finalize()
return []
elif not built_components_in_batch:
# If there are no successfully built components in a batch, there is nothing to tag.
# The repository won't be regenerated in this case and therefore we generate fake repo
# change message here.
if failed_components_in_batch:
log.info("Batch done, but not tagging because of failed "
"component builds.")
else:
log.info("Batch done. No component to tag")
log.info("Batch done. No component to tag")
further_work += [messaging.KojiRepoChange(
'components::_finalize: fake msg',
builder.module_build_tag['name'])]

3
tests/test_build/test_build.py
View File

@@ -658,9 +658,6 @@ class TestBuild(unittest.TestCase):
FakeModuleBuilder.BUILD_STATE = "COMPLETE"
# Tag the build in the -build tag
cls._send_tag(artifact_name)
if not artifact_name.startswith("module-build-macros"):
# Tag the build in the final tag
cls._send_tag(artifact_name, build=False)
FakeModuleBuilder.on_build_cb = on_build_cb