From d71fd10406131fd4ea9270d3e5f506c9b61dca74 Mon Sep 17 00:00:00 2001 From: Will Holland Date: Mon, 21 Sep 2015 12:32:04 +0100 Subject: Have builder slavenames come from config Rather than hardcoded --- source/master.cfg | 2 +- source/orch_config.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'source') diff --git a/source/master.cfg b/source/master.cfg index bfd23ce..df11887 100644 --- a/source/master.cfg +++ b/source/master.cfg @@ -77,7 +77,7 @@ c['builders'] = [] for column in orch_config.columns: c['builders'].append( BuilderConfig(name=column.name, - slavenames=["local-slave"], + slavenames=column.slavenames, factory=column.factory)) ####### STATUS TARGETS diff --git a/source/orch_config.py b/source/orch_config.py index 9e889fd..a20a9d1 100644 --- a/source/orch_config.py +++ b/source/orch_config.py @@ -42,16 +42,19 @@ columns = [ Column( name = "1. Integration", category = "repo_update", trigger = 'firehose_trigger.sh', + slavenames=["local-slave"], properties = [('repo_name','no repo name given'), ('ref','no ref given')]), Column( name = "2. Build", category = "definitions_update", trigger = 'builders_trigger.sh', + slavenames=["local-slave"], properties = [("ref","cu010-trove/br6/firehose-test-1")], get_definitions = True), Column( name = "3. Deploy", category = "build_complete", trigger = 'deploy_trigger.sh', + slavenames=["local-slave"], properties = [ ('system','no system give'), ('buildnumber',0), @@ -62,6 +65,7 @@ columns = [ Column( name = "4. Test", category = "deploy_complete", trigger = 'testing_trigger.sh', + slavenames=["local-slave"], properties = [ ('artefact','no artefact given'), ('testing_sha','no testing SHA given')])] -- cgit v1.2.1