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

Merge #446 Try to continue batch build only when there are some components to build, expire the build object to force its refresh from database

Browse Source
This commit is contained in:
Jan Kaluža
2017-03-17 18:07:29 +00:00
parent 197958d2a5 1c16c78cf9
commit c8e2e06e57
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
module_build_service/scheduler/handlers/modules.py
View File

@@ -137,6 +137,7 @@ def wait(config, session, msg):
build = models.ModuleBuild.from_module_event(session, msg)
if 'mbs' in build.mmd().xmd:
return build
session.expire(build)
raise RuntimeError("{!r} doesn't contain xmd information for MBS."
.format(build))

10
module_build_service/scheduler/producer.py
View File

@@ -179,7 +179,15 @@ class MBSProducer(PollingProducer):
state=models.BUILD_STATES['build']).all():
# If there are no components in the build state on the module build,
# then no possible event will start off new component builds
if not module_build.current_batch(koji.BUILD_STATES['BUILDING']):
unbuilt_components = [
c for c in module_build.component_builds
if (c.state != koji.BUILD_STATES['COMPLETE']
and c.state != koji.BUILD_STATES["FAILED"]
and c.state != koji.BUILD_STATES["CANCELED"])
]
if (not module_build.current_batch(koji.BUILD_STATES['BUILDING'])
and unbuilt_components):
# Initialize the builder...
builder = GenericBuilder.create_from_module(
session, module_build, config)