diff options
| author | Will Holland <william.holland@codethink.co.uk> | 2015-09-18 09:31:50 +0100 |
|---|---|---|
| committer | Will Holland <william.holland@codethink.co.uk> | 2015-09-18 09:31:50 +0100 |
| commit | 7103b34a5cf931eb53d3283700ca27d36cb9d716 (patch) | |
| tree | a14dd913cb449be0332e4eac63471d30d17663b7 | |
| parent | 8ce2c360cc726a9380ebd69db69a4fe9ca683b05 (diff) | |
| download | orchestration-7103b34a5cf931eb53d3283700ca27d36cb9d716.tar.gz | |
Fix properties arriving in the wrong order
| -rw-r--r-- | source/orch_config.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/orch_config.py b/source/orch_config.py index 27d615d..136bbfd 100644 --- a/source/orch_config.py +++ b/source/orch_config.py @@ -24,7 +24,7 @@ class Column: from buildbot.plugins import steps, util self.util_properties = [] - for property in self.properties.items(): + for property in self.properties: self.util_properties.append( util.Property(property[0],default=property[1])) @@ -42,28 +42,28 @@ columns = [ Column( name = "1. Integration", category = "repo_update", trigger = 'firehose_trigger.sh', - properties = {'repo_name':'no repo name given'}), + properties = [('repo_name','no repo name given')]), Column( name = "2. Build", category = "definitions_update", trigger = 'builders_trigger.sh', - properties = {"force":""}, + properties = [("force","")], get_definitions = True), Column( name = "3. Deploy", category = "build_complete", trigger = 'deploy_trigger.sh', - properties = { - 'system':'no system give', - 'buildnumber':0, - 'buildslave_scripts_sha':'no buildslave-scripts SHA given', - 'definitions_sha':'no definitions SHA given', - 'testing_sha':'no testing SHA given'}, + properties = [ + ('system','no system give'), + ('buildnumber',0), + ('buildslave_scripts_sha','no buildslave-scripts SHA given'), + ('definitions_sha','no definitions SHA given'), + ('testing_sha','no testing SHA given')], get_definitions = True), Column( name = "4. Test", category = "deploy_complete", trigger = 'testing_trigger.sh', - properties = { - 'artefact':'no artefact given', - 'testing_sha':'no testing SHA given'})] + properties = {[ + ('artefact','no artefact given'), + ('testing_sha','no testing SHA given')])] build_timeout = 1800 deploy_timeout = 1800 |