From 3d15fd2059988990cd86a9e3830430518a4a7888 Mon Sep 17 00:00:00 2001 From: Will Holland Date: Thu, 1 Oct 2015 00:01:13 +0100 Subject: Concat categories --- source/master.cfg | 3 ++- source/orch_config.py | 7 +------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/source/master.cfg b/source/master.cfg index a9f38db..2347886 100644 --- a/source/master.cfg +++ b/source/master.cfg @@ -49,7 +49,8 @@ c['change_source'].append(PBChangeSource( from buildbot.changes.filter import ChangeFilter categories = {} -for _c in configure.get_categories(): +#TODO get categories from orch_config rather than hard coded list +for _c in configure.get_categories()+orch_config.categories: categories[_c] = ChangeFilter(category=_c) ####### SCHEDULERS diff --git a/source/orch_config.py b/source/orch_config.py index a08d67b..a5babb2 100644 --- a/source/orch_config.py +++ b/source/orch_config.py @@ -1,12 +1,7 @@ import ciatlib categories = [ - 'repo_update', - 'definitions_update_local-slave', - 'definitions_update_arm-slave', - 'build_complete', - 'deploy_complete', - 'publish'] + 'repo_update'] buildslave_scripts = 'git://cu010-trove.codethink.com/cu010-trove/br6/buildslave-scripts.git' buildslave_source = ciatlib.master.GitSource(buildslave_scripts,'master') -- cgit v1.2.1