mirror of
https://pagure.io/fm-orchestrator.git
synced 2026-07-27 08:40:58 +08:00
Pass the module build into builder
This commit is contained in:
@@ -60,7 +60,8 @@ class CoprModuleBuilder(GenericBuilder):
|
||||
self.owner = owner
|
||||
self.config = config
|
||||
self.tag_name = tag_name
|
||||
self.module_str = module
|
||||
self.module = module
|
||||
self.module_str = module.name
|
||||
|
||||
self.copr = None
|
||||
self.client = CoprModuleBuilder._get_client(config)
|
||||
|
||||
@@ -61,12 +61,12 @@ class KojiModuleBuilder(GenericBuilder):
|
||||
def __init__(self, owner, module, config, tag_name, components):
|
||||
"""
|
||||
:param owner: a string representing who kicked off the builds
|
||||
:param module: string representing module
|
||||
:param module: module_build_service.models.ModuleBuild instance.
|
||||
:param config: module_build_service.config.Config instance
|
||||
:param tag_name: name of tag for given module
|
||||
"""
|
||||
self.owner = owner
|
||||
self.module_str = module
|
||||
self.module_str = module.name
|
||||
self.config = config
|
||||
self.tag_name = tag_name
|
||||
self.__prep = False
|
||||
|
||||
@@ -94,7 +94,7 @@ mdpolicy=group:primary
|
||||
|
||||
@module_build_service.utils.validate_koji_tag('tag_name')
|
||||
def __init__(self, owner, module, config, tag_name, components):
|
||||
self.module_str = module
|
||||
self.module_str = module.name
|
||||
self.tag_name = tag_name
|
||||
self.config = config
|
||||
self.groups = []
|
||||
|
||||
@@ -100,7 +100,7 @@ class GenericBuilder(six.with_metaclass(ABCMeta)):
|
||||
def create(cls, owner, module, backend, config, **extra):
|
||||
"""
|
||||
:param owner: a string representing who kicked off the builds
|
||||
:param module: a module string e.g. 'testmodule-1.0'
|
||||
:param module: module_build_service.models.ModuleBuild instance.
|
||||
:param backend: a string representing backend e.g. 'koji'
|
||||
:param config: instance of module_build_service.config.Config
|
||||
|
||||
@@ -125,7 +125,7 @@ class GenericBuilder(six.with_metaclass(ABCMeta)):
|
||||
"""
|
||||
components = [c.package for c in module.component_builds]
|
||||
builder = GenericBuilder.create(
|
||||
module.owner, module.name, config.system, config,
|
||||
module.owner, module, config.system, config,
|
||||
tag_name=module.koji_tag, components=components)
|
||||
groups = GenericBuilder.default_buildroot_groups(session, module)
|
||||
builder.buildroot_connect(groups)
|
||||
|
||||
Reference in New Issue
Block a user