diff options
| author | Will Holland <william.holland@codethink.co.uk> | 2015-09-22 07:08:05 +0100 |
|---|---|---|
| committer | Will Holland <william.holland@codethink.co.uk> | 2015-09-22 07:08:05 +0100 |
| commit | 423df35e63aa6008fce88b37e5f1d543ca9463e4 (patch) | |
| tree | 46dee81be9ae52ea6b8adfab3c90479d3e343c30 | |
| parent | 043f837881f95dda6b9b91ba8e57c0775cbf4be7 (diff) | |
| download | orchestration-423df35e63aa6008fce88b37e5f1d543ca9463e4.tar.gz | |
Add timeout
This got lost while making the column abstraction. Column now takes a timeout
which is passed to buildbot ShellCommand.
| -rw-r--r-- | source/orch_config.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/orch_config.py b/source/orch_config.py index b298ff6..9885655 100644 --- a/source/orch_config.py +++ b/source/orch_config.py @@ -14,12 +14,14 @@ class Column: trigger, slavenames, properties, + timeout=1200, get_definitions=False): self.name = name self.category = category self.trigger = 'triggers/%s' % trigger self.slavenames = slavenames self.properties = properties + self.timeout = timeout self.get_definitions=get_definitions from buildbot.process.factory import BuildFactory @@ -39,7 +41,7 @@ class Column: if self.get_definitions: sha = util.Property("sha","cu010-trove/br6/firehose-test-1") get_defns_cmd = ['sh','get_definitions.sh',sha] - self.factory.addStep(ShellCommand(command=get_defns_cmd)) + self.factory.addStep(ShellCommand(command=get_defns_cmd),timeout=self.timeout) self.factory.addStep(ShellCommand(command=self.cmd)) columns = [ @@ -56,6 +58,7 @@ columns = [ properties = [("ref","cu010-trove/br6/firehose-test-1"), ("sha","HEAD"), ("system",'genivi-demo-platform-x86_64-generic.morph')], + timeout = 1800, get_definitions = True), Column( name = "3. ARM Build", category = "definitions_update_arm-slave", @@ -64,6 +67,7 @@ columns = [ properties = [("ref","cu010-trove/arm-base"), ("sha","HEAD"), ("system",'base-system-armv8l64.morph')], + timeout = 1800, get_definitions = True), Column( name = "4. x86_64 Deploy", category = "build_complete", @@ -75,6 +79,7 @@ columns = [ ('buildslave_scripts_sha','no buildslave-scripts SHA given'), ('definitions_sha','no definitions SHA given'), ('testing_sha','no testing SHA given')], + timeout = 1800, get_definitions = True), Column( name = "5. Test", category = "deploy_complete", @@ -84,8 +89,6 @@ columns = [ ('artefact','no artefact given'), ('testing_sha','no testing SHA given')])] -build_timeout = 1800 -deploy_timeout = 1800 web_user = "codething" web_user_password = "password" definitions_base_ref = "refs/heads/cu010-trove/br6/genivi-demo-platform" |