diff options
| author | Will Holland <william.holland@codethink.co.uk> | 2015-09-21 12:15:57 +0100 |
|---|---|---|
| committer | Will Holland <william.holland@codethink.co.uk> | 2015-09-21 12:15:57 +0100 |
| commit | 614cf868253118906d9e5be5c1d0bc3ff464b781 (patch) | |
| tree | 390089f6be627a21ef356275b007d5593717734a | |
| parent | 120b226d0f8b5ffe6d94c1443df00db0f6e9f737 (diff) | |
| download | orchestration-614cf868253118906d9e5be5c1d0bc3ff464b781.tar.gz | |
Make slaves be set from orch_config.py
| -rw-r--r-- | source/master.cfg | 10 | ||||
| -rw-r--r-- | source/orch_config.py | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/source/master.cfg b/source/master.cfg index cb3600b..bfd23ce 100644 --- a/source/master.cfg +++ b/source/master.cfg @@ -4,6 +4,9 @@ # This is a sample buildmaster config file. It must be installed as # 'master.cfg' in your buildmaster's base directory. +import imp +orch_config = imp.load_source('orch_config', '../../source/orch_config.py') + # This is the dictionary that the buildmaster pays attention to. We also use # a shorter alias to save typing. c = BuildmasterConfig = {} @@ -14,7 +17,10 @@ c = BuildmasterConfig = {} # a BuildSlave object, specifying a unique slave name and password. The same # slave name and password must be configured on the slave. from buildbot.buildslave import BuildSlave -c['slaves'] = [BuildSlave("local-slave", "pass")] +c['slaves'] = [] + +for slave in orch_config.slaves: + c['slaves'].append(BuildSlave(slave['name'], slave['password'])) # 'protocols' contains information about protocols which master will use for # communicating with slaves. @@ -38,8 +44,6 @@ c['change_source'].append(PBChangeSource( passwd='orchestration')) from buildbot.changes.filter import ChangeFilter -import imp -orch_config = imp.load_source('orch_config', '../../source/orch_config.py') categories = {} for _c in orch_config.categories: diff --git a/source/orch_config.py b/source/orch_config.py index 2ad6443..9e889fd 100644 --- a/source/orch_config.py +++ b/source/orch_config.py @@ -71,3 +71,6 @@ deploy_timeout = 1800 web_user = "codething" web_user_password = "password" definitions_base_ref = "cu010-trove/br6/genivi-demo-platform" +slaves = [ + {'name':'local-slave','password':'pass'}, + {'name':'arm-slave','password':'pass'}] |