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

Merge #1093 List package name in failed state reason

Browse Source
This commit is contained in:
Matt Prahl
2018-12-18 21:19:14 +00:00
parent 25122cb53e 5c2b411309
commit 8bb50cfe16
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,8 +100,11 @@ def _finalize(config, session, msg, state):
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.")
state_reason = 'Component(s) {} failed to build.'.format(
', '.join(c.package for c in failed_components_in_batch))
parent.transition(config,
state=models.BUILD_STATES['failed'],
state_reason=state_reason)
session.commit()
return []
elif not built_components_in_batch:

20
module_build_service/scheduler/handlers/repos.py
View File

@@ -87,14 +87,18 @@ def done(config, session, msg):
# Assemble the list of all successful components in the batch.
good = [c for c in current_batch if c.state == koji.BUILD_STATES['COMPLETE']]
failed_states = (koji.BUILD_STATES['FAILED'],
koji.BUILD_STATES['CANCELED'])
# If *none* of the components completed for this batch, then obviously the
# module fails. However! We shouldn't reach this scenario. There is
# logic over in the component handler which should fail the module build
# first before we ever get here. This is here as a race condition safety
# valve.
if module_build.component_builds and not good:
module_build.transition(config, models.BUILD_STATES['failed'],
"Some components failed to build.")
state_reason = 'Component(s) {} failed to build.'.format(
', '.join(c.package for c in current_batch if c.state in failed_states))
module_build.transition(config, models.BUILD_STATES['failed'], state_reason)
session.commit()
log.warning("Odd! All components in batch failed for %r." % module_build)
return
@@ -121,8 +125,7 @@ def done(config, session, msg):
for c in module_build.component_builds:
if c.state in [None, koji.BUILD_STATES['BUILDING']]:
has_unbuilt_components = True
elif (c.state in [koji.BUILD_STATES['FAILED'],
koji.BUILD_STATES['CANCELED']]):
elif (c.state in failed_states):
has_failed_components = True
further_work = []
@@ -141,8 +144,13 @@ def done(config, session, msg):
else:
if has_failed_components:
module_build.transition(config, state=models.BUILD_STATES['failed'],
state_reason="Some components failed to build.")
state_reason = 'Component(s) {} failed to build.'.format(
', '.join(c.package for c in module_build.component_builds
if c.state in failed_states)
)
module_build.transition(config,
state=models.BUILD_STATES['failed'],
state_reason=state_reason)
else:
module_build.transition(config, state=models.BUILD_STATES['done'])
session.commit()

7
tests/test_build/test_build.py
View File

@@ -697,13 +697,13 @@ class TestBuild:
# we had a failing component in batch 2.
elif c.package == "tangerine":
assert c.state == koji.BUILD_STATES['FAILED']
assert c.state_reason == "Some components failed to build."
assert c.state_reason == "Component(s) perl-Tangerine failed to build."
else:
assert c.state == koji.BUILD_STATES['COMPLETE']
# Whole module should be failed.
assert c.module_build.state == models.BUILD_STATES['failed']
assert c.module_build.state_reason == "Some components failed to build."
assert c.module_build.state_reason == "Component(s) perl-Tangerine failed to build."
# We should end up with batch 2 and never start batch 3, because
# there were failed components in batch 2.
@@ -750,7 +750,8 @@ class TestBuild:
# Whole module should be failed.
assert c.module_build.state == models.BUILD_STATES['failed']
assert c.module_build.state_reason == "Some components failed to build."
assert c.module_build.state_reason == \
"Component(s) perl-Tangerine, perl-List-Compare failed to build."
# We should end up with batch 2 and never start batch 3, because
# there were failed components in batch 2.