diff options
| author | Will Holland <william.holland@codethink.co.uk> | 2015-09-21 16:17:52 +0100 |
|---|---|---|
| committer | Will Holland <william.holland@codethink.co.uk> | 2015-09-21 16:19:09 +0100 |
| commit | 8644f2bb78bc40a78b619f24163fa01fd329886d (patch) | |
| tree | 363feb914374e98566968d37d5ccc63fa1bc0c34 | |
| parent | b2756a025c3d5d786610e11b91f427b9b072dcc3 (diff) | |
| download | orchestration-8644f2bb78bc40a78b619f24163fa01fd329886d.tar.gz | |
Pass sha to get_defintions
| -rw-r--r-- | source/bottlerock.py | 5 | ||||
| -rw-r--r-- | source/orch_config.py | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/source/bottlerock.py b/source/bottlerock.py index a9228f4..465a001 100644 --- a/source/bottlerock.py +++ b/source/bottlerock.py @@ -79,6 +79,7 @@ def repo_update(): changes = request.json['changes'] for change in changes: ref = change['ref'] + sha = change['new'] if repo_name == DEFINITIONS: if ref == orch_config.definitions_base_ref: # if baseref changes trigger firehose @@ -86,10 +87,10 @@ def repo_update(): return sendchange('repo_update',properties) elif ref in orch_config.candidate_refs.keys(): slave = orch_config.candidate_refs[ref] - properties = {"ref":ref} + properties = {"ref":ref,"sha":sha} return sendchange('definitions_update_%s' % slave,properties) elif repo_name == TEST_REPO: - force = {"ref":"force"} + force = {"ref":"force","sha":sha} return sendchange('definitions_update',force) else: properties = {'repo_name':repo_name,'ref':ref} diff --git a/source/orch_config.py b/source/orch_config.py index 0c541e5..68aee94 100644 --- a/source/orch_config.py +++ b/source/orch_config.py @@ -37,7 +37,8 @@ class Column: mode='incremental')) self.cmd = ['sh',self.trigger]+self.util_properties if self.get_definitions: - get_defns_cmd = ['sh','get_definitions.sh'] + 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=self.cmd)) @@ -52,13 +53,15 @@ columns = [ category = "definitions_update_local-slave", trigger = 'builders_trigger.sh', slavenames=["local-slave"], - properties = [("ref","cu010-trove/br6/firehose-test-1")], + properties = [("ref","cu010-trove/br6/firehose-test-1"), + ("sha","HEAD")], get_definitions = True), Column( name = "3. ARM Build", category = "definitions_update_arm-slave", trigger = 'builders_trigger.sh', slavenames=["arm-slave"], - properties = [("ref","cu010-trove/arm-base")], + properties = [("ref","cu010-trove/arm-base"), + ("sha","HEAD")], get_definitions = True), Column( name = "4. x86_64 Deploy", category = "build_complete", |