From 18c2f89a572dab090833e6e81ec1ceba9115db8d Mon Sep 17 00:00:00 2001 From: Will Holland Date: Wed, 30 Sep 2015 20:23:32 +0100 Subject: Change master.cfg to use configure Rather than orch_config --- source/master.cfg | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/source/master.cfg b/source/master.cfg index 9df5c7f..714394e 100644 --- a/source/master.cfg +++ b/source/master.cfg @@ -6,6 +6,8 @@ import imp orch_config = imp.load_source('orch_config', '../../source/orch_config.py') +configure = imp.load_source('orch_config', '../../source/configure.py') +configure.configure() # This is the dictionary that the buildmaster pays attention to. We also use # a shorter alias to save typing. @@ -19,6 +21,7 @@ c = BuildmasterConfig = {} from buildbot.buildslave import BuildSlave c['slaves'] = [] +# TODO this needs replacing to be elastic for slave in orch_config.slaves: c['slaves'].append(BuildSlave(slave['name'], slave['password'])) @@ -46,7 +49,7 @@ c['change_source'].append(PBChangeSource( from buildbot.changes.filter import ChangeFilter categories = {} -for _c in orch_config.categories: +for _c in configure.get_categories(): categories[_c] = ChangeFilter(category=_c) ####### SCHEDULERS @@ -57,8 +60,9 @@ for _c in orch_config.categories: from buildbot.schedulers.basic import SingleBranchScheduler from buildbot.schedulers.forcesched import ForceScheduler from buildbot.changes import filter +columns = configure.get_columns() c['schedulers'] = [] -for column in orch_config.columns: +for column in columns: c['schedulers'].append(SingleBranchScheduler( name = "%s_sched" % column.category, change_filter = categories[column.category], @@ -74,7 +78,7 @@ for column in orch_config.columns: from buildbot.config import BuilderConfig c['builders'] = [] -for column in orch_config.columns: +for column in columns: c['builders'].append( BuilderConfig(name=column.name, slavenames=column.slavenames, -- cgit v1.2.1