From de796c2b73cda9658bff6cf0541126e475dcfc38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= Date: Thu, 18 Aug 2016 17:34:14 +0200 Subject: [PATCH] Use Builder wrapper instead of KojiModuleBuilder --- module_build_service/scheduler/handlers/components.py | 2 +- module_build_service/scheduler/handlers/modules.py | 2 +- module_build_service/scheduler/handlers/repos.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module_build_service/scheduler/handlers/components.py b/module_build_service/scheduler/handlers/components.py index 5b2ca568..c058c329 100644 --- a/module_build_service/scheduler/handlers/components.py +++ b/module_build_service/scheduler/handlers/components.py @@ -77,7 +77,7 @@ def _finalize(config, session, msg, state): # And install the macros. module_name = parent.name tag = parent.koji_tag - builder = module_build_service.builder.Builder(parent.owner, module_name, 'koji', + builder = module_build_service.builder.Builder(parent.owner, module_name, config.system, config, tag_name=tag) builder.buildroot_connect() # tag && add to srpm-build group diff --git a/module_build_service/scheduler/handlers/modules.py b/module_build_service/scheduler/handlers/modules.py index 36ca71fd..6f30f7c4 100644 --- a/module_build_service/scheduler/handlers/modules.py +++ b/module_build_service/scheduler/handlers/modules.py @@ -118,7 +118,7 @@ def wait(config, session, msg): log.debug("Assigning koji tag=%s to module build" % tag) build.koji_tag = tag - builder = module_build_service.builder.Builder(build.owner, build.name, 'koji', config, + builder = module_build_service.builder.Builder(build.owner, build.name, config.system, config, tag_name=tag) build.buildroot_task_id = builder.buildroot_connect() log.debug("Adding dependencies %s into buildroot for module %s" % (dependencies, module_info)) diff --git a/module_build_service/scheduler/handlers/repos.py b/module_build_service/scheduler/handlers/repos.py index 64f016ce..f1683cd8 100644 --- a/module_build_service/scheduler/handlers/repos.py +++ b/module_build_service/scheduler/handlers/repos.py @@ -76,7 +76,7 @@ def done(config, session, msg): return builder = module_build_service.builder.Builder(module_build.owner, module_build.name, - 'koji', config, tag_name=tag) + config.system, config, tag_name=tag) builder.buildroot_connect() # Ok, for the subset of builds that did complete successfully, check to