From cd63cde09de135e921b3a0d9c4c3b4e21d37d061 Mon Sep 17 00:00:00 2001 From: Will Holland Date: Thu, 17 Sep 2015 08:55:13 +0100 Subject: Get categories from config file So that bottlerock and master.cfg share categories --- source/master.cfg | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'source/master.cfg') diff --git a/source/master.cfg b/source/master.cfg index b6a0344..f9cb1af 100644 --- a/source/master.cfg +++ b/source/master.cfg @@ -38,11 +38,12 @@ c['change_source'].append(PBChangeSource( passwd='orchestration')) from buildbot.changes.filter import ChangeFilter +import imp +orch_config = imp.load_source('module.name', '../../source/orch_config.py') -definitions_filter = ChangeFilter(category='definitions_update') -lorry_filter = ChangeFilter(category='repo_update') -postbuild_filter = ChangeFilter(category='build_complete') -postdeploy_filter = ChangeFilter(category='deploy_complete') +categories = {} +for _c in orch_config.categories: + categories[_c] = ChangeFilter(category=_c) ####### SCHEDULERS @@ -54,25 +55,25 @@ from buildbot.schedulers.forcesched import ForceScheduler from buildbot.changes import filter c['schedulers'] = [] c['schedulers'].append(SingleBranchScheduler( - name="trigger_firehose_sched", - change_filter=lorry_filter, - treeStableTimer=None, - builderNames=["1. Integration"])) + name = "trigger_firehose_sched", + change_filter = categories['repo_update'], + treeStableTimer = None, + builderNames = ["1. Integration"])) c['schedulers'].append(SingleBranchScheduler( - name="trigger_builders_sched", - change_filter=definitions_filter, - treeStableTimer=None, - builderNames=["2. Build"])) + name = "trigger_builders_sched", + change_filter = categories['definitions_update'], + treeStableTimer = None, + builderNames = ["2. Build"])) c['schedulers'].append(SingleBranchScheduler( - name="trigger_deploy_sched", - change_filter=postbuild_filter, - treeStableTimer=None, - builderNames=["3. Deploy"])) + name = "trigger_deploy_sched", + change_filter = categories['build_complete'], + treeStableTimer = None, + builderNames = ["3. Deploy"])) c['schedulers'].append(SingleBranchScheduler( - name="trigger_testing_sched", - change_filter=postdeploy_filter, - treeStableTimer=None, - builderNames=["4. Test"])) + name = "trigger_testing_sched", + change_filter = categories['deploy_complete'], + treeStableTimer = None, + builderNames = ["4. Test"])) ####### BUILDERS -- cgit v1.2.1