Merge #787 Make our builders into setuptools plugins.

This commit is contained in:
Matt Prahl
2017-11-13 18:56:16 +00:00
12 changed files with 69 additions and 50 deletions

View File

@@ -1,17 +1,10 @@
from module_build_service import conf
import pkg_resources
from base import GenericBuilder
from KojiModuleBuilder import KojiModuleBuilder
from MockModuleBuilder import MockModuleBuilder
__all__ = [
GenericBuilder
]
GenericBuilder.register_backend_class(KojiModuleBuilder)
GenericBuilder.register_backend_class(MockModuleBuilder)
if conf.system == "copr":
from CoprModuleBuilder import CoprModuleBuilder
GenericBuilder.register_backend_class(CoprModuleBuilder)
for entrypoint in pkg_resources.iter_entry_points('mbs.builder_backends'):
GenericBuilder.register_backend_class(entrypoint.load())

View File

@@ -65,7 +65,7 @@ class MBSProducer(PollingProducer):
if conf.system == 'koji':
# We don't do this on behalf of users
koji_session = module_build_service.builder.KojiModuleBuilder\
koji_session = module_build_service.builder.KojiModuleBuilder.KojiModuleBuilder\
.get_session(conf, None)
log.info('Querying tasks for statuses:')
res = models.ComponentBuild.query.filter_by(
@@ -231,7 +231,7 @@ class MBSProducer(PollingProducer):
if config.system != 'koji':
return
koji_session = module_build_service.builder.KojiModuleBuilder\
koji_session = module_build_service.builder.KojiModuleBuilder.KojiModuleBuilder\
.get_session(config, None)
for module_build in session.query(models.ModuleBuild) \
@@ -263,7 +263,7 @@ class MBSProducer(PollingProducer):
now = datetime.utcnow()
koji_session = module_build_service.builder.KojiModuleBuilder\
koji_session = module_build_service.builder.KojiModuleBuilder.KojiModuleBuilder\
.get_session(config, None)
for target in koji_session.getBuildTargets():
koji_tag = target["dest_tag_name"]