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

Replace name dependencies with dep_koji_tags in wait handler

Browse Source 
The value referenced by variable dependencies is a list of koji_tags.
So, it would be more straightforward to use an alternative name like
dep_koji_tags than dependencies which is too general.

Signed-off-by: Chenxiong Qi <cqi@redhat.com>
This commit is contained in:
Chenxiong Qi
2018-11-07 17:31:36 +08:00
parent bc682ff15d
commit 1ef30f642e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -223,7 +223,7 @@ def wait(config, session, msg):
# of the local module build based on Modulemd.Module, because the
# local build is not stored in the external MBS and therefore we
# cannot query it using the `query` as for Koji below.
dependencies = resolver.get_module_build_dependencies(
dep_koji_tags = resolver.get_module_build_dependencies(
mmd=build.mmd(), strict=True).keys()
# We also don't want to get the tag name from the MBS, but just
@@ -236,7 +236,7 @@ def wait(config, session, msg):
log.info("Getting deps for %s" % (nsvc))
deps_dict = resolver.get_module_build_dependencies(
build.name, build.stream, build.version, build.context, strict=True)
dependencies = set(deps_dict.keys())
dep_koji_tags = set(deps_dict.keys())
# Find out the name of Koji tag to which the module's Content
# Generator build should be tagged once the build finishes.
@@ -251,10 +251,10 @@ def wait(config, session, msg):
log.info('Getting tag for {0}'.format(nsvc))
tag = generate_koji_tag(build.name, build.stream, build.version, build.context)
return dependencies, tag, cg_build_koji_tag
return dep_koji_tags, tag, cg_build_koji_tag
try:
dependencies, tag, cg_build_koji_tag = _get_deps_and_tag()
dep_koji_tags, tag, cg_build_koji_tag = _get_deps_and_tag()
except ValueError:
reason = "Failed to get module info from MBS. Max retries reached."
log.exception(reason)
@@ -277,9 +277,9 @@ def wait(config, session, msg):
builder = module_build_service.builder.GenericBuilder.create_from_module(
session, build, config)
log.debug("Adding dependencies %s into buildroot for module %s" % (dependencies, ':'.join(
log.debug("Adding dependencies %s into buildroot for module %s" % (dep_koji_tags, ':'.join(
[build.name, build.stream, build.version])))
builder.buildroot_add_repos(dependencies)
builder.buildroot_add_repos(dep_koji_tags)
if not build.component_builds:
log.info("There are no components in module %r, skipping build" % build)