diff options
| author | Will Holland <william.holland@codethink.co.uk> | 2015-09-17 10:17:16 +0100 |
|---|---|---|
| committer | Will Holland <william.holland@codethink.co.uk> | 2015-09-17 10:17:16 +0100 |
| commit | 1630df20bab9a47fc3afb5f6daebcfba3c55b6fa (patch) | |
| tree | 3eb6f80aa5e615a832371590a0a49bb284ea7948 | |
| parent | 6a43c408306703761479510d7d66061fd5a8da4c (diff) | |
| download | orchestration-1630df20bab9a47fc3afb5f6daebcfba3c55b6fa.tar.gz | |
Move buildslave-scripts to config
| -rw-r--r-- | source/master.cfg | 8 | ||||
| -rw-r--r-- | source/orch_config.py | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source/master.cfg b/source/master.cfg index 0b44e88..281b94a 100644 --- a/source/master.cfg +++ b/source/master.cfg @@ -87,7 +87,7 @@ from buildbot.plugins import steps, util firehose_factory = BuildFactory() firehose_factory.addStep(steps.Git( - repourl='git://cu010-trove.codethink.com/cu010-trove/br6/buildslave-scripts.git', + repourl=orch_config.buildslave_scripts, mode='incremental')) repo_name = util.Property('repo_name',default="no repo name given") firehose_cmd = ["sh","triggers/firehose_trigger.sh",repo_name] @@ -95,7 +95,7 @@ firehose_factory.addStep(ShellCommand(command=firehose_cmd)) builders_factory = BuildFactory() builders_factory.addStep(steps.Git( - repourl='git://cu010-trove.codethink.com/cu010-trove/br6/buildslave-scripts.git', + repourl=orch_config.buildslave_scripts, mode='incremental')) builders_factory.addStep(ShellCommand(command=["sh","get_definitions.sh"])) force = util.Property('force',default="") @@ -105,7 +105,7 @@ builders_factory.addStep(ShellCommand(command=builders_cmd, deploy_factory = BuildFactory() deploy_factory.addStep(steps.Git( - repourl='git://cu010-trove.codethink.com/cu010-trove/br6/buildslave-scripts.git', + repourl=orch_config.buildslave_scripts, mode='incremental')) deploy_factory.addStep(ShellCommand(command=["sh","get_definitions.sh"])) system = util.Property('system',default="no system given") @@ -124,7 +124,7 @@ deploy_factory.addStep(ShellCommand(command=deploy_cmd, testing_factory = BuildFactory() testing_factory.addStep(steps.Git( - repourl='git://cu010-trove.codethink.com/cu010-trove/br6/buildslave-scripts.git', + repourl=orch_config.buildslave_scripts, mode='incremental')) artefact = util.Property('artefact',default=0) testing_sha = util.Property('testing_sha',default="no_testing_sha_given") diff --git a/source/orch_config.py b/source/orch_config.py index 8f78ee2..f074050 100644 --- a/source/orch_config.py +++ b/source/orch_config.py @@ -6,3 +6,4 @@ categories = [ build_timeout = 1800 deploy_timeout = 1800 +buildslave_scripts = 'git://cu010-trove.codethink.com/cu010-trove/br6/buildslave-scripts.git' |