From bc682ff15dd08b19b7c2b6005553f681917c6517 Mon Sep 17 00:00:00 2001 From: Chenxiong Qi Date: Wed, 7 Nov 2018 17:09:16 +0800 Subject: [PATCH 1/3] No need set initial value to tag and dependencies in wait handler Both tag and dependencies are set directly by calling private method _get_deps_and_tag. There is no need to set initial value for them separately. Signed-off-by: Chenxiong Qi --- module_build_service/scheduler/handlers/modules.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/module_build_service/scheduler/handlers/modules.py b/module_build_service/scheduler/handlers/modules.py index f6bcd43d..7faf8068 100644 --- a/module_build_service/scheduler/handlers/modules.py +++ b/module_build_service/scheduler/handlers/modules.py @@ -206,9 +206,6 @@ def wait(config, session, msg): # This is ok.. it's a race condition we can ignore. pass - tag = None - dependencies = [] - resolver = module_build_service.resolver.system_resolver @module_build_service.utils.retry( From 1ef30f642e79d702f2f92fcfda7445baba45e1f8 Mon Sep 17 00:00:00 2001 From: Chenxiong Qi Date: Wed, 7 Nov 2018 17:31:36 +0800 Subject: [PATCH 2/3] Replace name dependencies with dep_koji_tags in wait handler 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 --- module_build_service/scheduler/handlers/modules.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/module_build_service/scheduler/handlers/modules.py b/module_build_service/scheduler/handlers/modules.py index 7faf8068..d32abe07 100644 --- a/module_build_service/scheduler/handlers/modules.py +++ b/module_build_service/scheduler/handlers/modules.py @@ -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) From a1efbaae669c1d45c79796484748a20a4a3cd47c Mon Sep 17 00:00:00 2001 From: Chenxiong Qi Date: Wed, 7 Nov 2018 17:35:42 +0800 Subject: [PATCH 3/3] Fix out-dated comment to KojiModuleBuilder.module_build_tag Signed-off-by: Chenxiong Qi --- module_build_service/builder/KojiModuleBuilder.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module_build_service/builder/KojiModuleBuilder.py b/module_build_service/builder/KojiModuleBuilder.py index 5a445b60..5981ecba 100644 --- a/module_build_service/builder/KojiModuleBuilder.py +++ b/module_build_service/builder/KojiModuleBuilder.py @@ -178,7 +178,8 @@ class KojiModuleBuilder(GenericBuilder): # These eventually get populated by calling _connect and __prep is set to True self.module_tag = None # string - self.module_build_tag = None # string + # A dict containing tag info returned from Koji API getTag. + self.module_build_tag = None self.module_target = None # A koji target dict self.build_priority = config.koji_build_priority