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

Clarify and add log statements when an orphaned module-build-macros is used

Browse Source
This commit is contained in:
mprahl
2017-12-08 16:07:32 -05:00
parent 1fa6cc6fc5
commit f478e69307
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -298,12 +298,6 @@ def wait(config, session, msg):
session.commit()
return []
# Build the module-build-macros
# inject dist-tag into buildroot
srpm = builder.get_disttag_srpm(
disttag=".%s" % get_rpm_release_from_mmd(build.mmd()),
module_build=build)
log.debug("Starting build batch 1")
build.batch = 1
session.commit()
@@ -314,6 +308,9 @@ def wait(config, session, msg):
session, artifact_name, build.id)
further_work = []
if not component_build:
srpm = builder.get_disttag_srpm(
disttag=".%s" % get_rpm_release_from_mmd(build.mmd()),
module_build=build)
component_build = models.ComponentBuild(
module_id=build.id,
package=artifact_name,
@@ -328,6 +325,7 @@ def wait(config, session, msg):
session.refresh(component_build)
msgs = builder.recover_orphaned_artifact(component_build)
if msgs:
log.info('Found an existing module-build-macros build')
further_work += msgs
# There was no existing artifact found, so lets submit the build instead
else:
@@ -342,6 +340,7 @@ def wait(config, session, msg):
# first
msgs = builder.recover_orphaned_artifact(component_build)
if msgs:
log.info('Found an existing module-build-macros build')
further_work += msgs
else:
task_id, state, reason, nvr = builder.build(artifact_name=artifact_name, source=srpm)