diff options
| author | Will Holland <william.holland@codethink.co.uk> | 2015-09-17 09:20:07 +0100 |
|---|---|---|
| committer | Will Holland <william.holland@codethink.co.uk> | 2015-09-17 09:20:07 +0100 |
| commit | 6a43c408306703761479510d7d66061fd5a8da4c (patch) | |
| tree | 22a12d3dcbf113dc2a9fc73a97e71004245cdc7a | |
| parent | cd63cde09de135e921b3a0d9c4c3b4e21d37d061 (diff) | |
| download | orchestration-6a43c408306703761479510d7d66061fd5a8da4c.tar.gz | |
Add build and deploy timeouts to config
| -rw-r--r-- | source/master.cfg | 6 | ||||
| -rw-r--r-- | source/orch_config.py | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/source/master.cfg b/source/master.cfg index f9cb1af..0b44e88 100644 --- a/source/master.cfg +++ b/source/master.cfg @@ -100,7 +100,8 @@ builders_factory.addStep(steps.Git( builders_factory.addStep(ShellCommand(command=["sh","get_definitions.sh"])) force = util.Property('force',default="") builders_cmd = ["sh","triggers/builders_trigger.sh",force] -builders_factory.addStep(ShellCommand(command=builders_cmd)) +builders_factory.addStep(ShellCommand(command=builders_cmd, + timeout=orch_config.build_timeout)) deploy_factory = BuildFactory() deploy_factory.addStep(steps.Git( @@ -118,7 +119,8 @@ deploy_cmd = ["sh","triggers/deploy_trigger.sh", buildslave_scripts_sha, definitions_sha, testing_sha] -deploy_factory.addStep(ShellCommand(command=deploy_cmd)) +deploy_factory.addStep(ShellCommand(command=deploy_cmd, + timeout=orch_config.deploy_timeout)) testing_factory = BuildFactory() testing_factory.addStep(steps.Git( diff --git a/source/orch_config.py b/source/orch_config.py index 73e7fab..8f78ee2 100644 --- a/source/orch_config.py +++ b/source/orch_config.py @@ -3,3 +3,6 @@ categories = [ 'definitions_update', 'build_complete', 'deploy_complete'] + +build_timeout = 1800 +deploy_timeout = 1800 |