fix buildbot base module

This commit is contained in:
Andrei Yankovich 2020-06-19 11:00:50 +03:00
parent f43f485789
commit 2483a6a68d
2 changed files with 9 additions and 14 deletions

View File

@ -3,8 +3,8 @@
class BuildBotModule:
def __init__(self):
self.masterConf = {}
def __init__(self, masterConf):
self.masterConf = masterConf
def getMasterConf(self):
return self.masterConf

View File

@ -15,24 +15,20 @@ sys.path.append(dir_path)
class BuildBot:
masterConf = {}
workers = BuildBotWorkers()
services = BuildBotServices()
identity = BuildBotIdentity()
db = BuildBotDB()
shedulers = BuildBotShedulers()
sources = BuildBotChangeSource()
builders = []
# def importWithReload(self, name):
# module = importlib.import_module(name);
# return module;
def __init__(self):
self.masterConf = {}
self.masterConf['builders'] = []
self.masterConf['schedulers'] = []
self.masterConf['change_source'] = []
self.workers = BuildBotWorkers(self.masterConf)
self.services = BuildBotServices(self.masterConf)
self.identity = BuildBotIdentity(self.masterConf)
self.db = BuildBotDB(self.masterConf)
self.shedulers = BuildBotShedulers(self.masterConf)
self.sources = BuildBotChangeSource(self.masterConf)
# WORKERS
self.masterConf.update(self.workers.getMasterConf())
@ -58,7 +54,6 @@ class BuildBot:
)
self.shedulers.addScheduler(factory.getPropertyes(),
worker)
self.builders.append(worker)
def addService(self, service):
logging.error("addService not support!")