diff options
Diffstat (limited to 'source/master.cfg')
| -rw-r--r-- | source/master.cfg | 6 |
1 files changed, 4 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( |