diff options
author | Will Holland <william.holland@codethink.co.uk> | 2015-09-18 12:12:21 +0100 |
---|---|---|
committer | Will Holland <william.holland@codethink.co.uk> | 2015-09-21 11:27:10 +0100 |
commit | 4f58b0b9c437299bcf11aca1464067dbb663705b (patch) | |
tree | 20bab2ab6de3b3fc3e216767cae37e699c557619 | |
parent | 3224077fdab322d66697eb0fb3451b8e576819db (diff) | |
download | orchestration-4f58b0b9c437299bcf11aca1464067dbb663705b.tar.gz |
Get the ref of definitions from the json from trove
-rw-r--r-- | source/bottlerock.py | 24 | ||||
-rw-r--r-- | source/orch_config.py | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/source/bottlerock.py b/source/bottlerock.py index 71bb4f4..90aaf22 100644 --- a/source/bottlerock.py +++ b/source/bottlerock.py @@ -69,21 +69,21 @@ def missing_property_response(property): @post('/repo_update') def repo_update(): - try: - properties = get_form("repo_name") - except Status400 as p: - return missing_property_response(p) - if properties['repo_name'] == DEFINITIONS: - return sendchange('definitions_update',dict()) - elif properties['repo_name'] == TEST_REPO: - force = {"force":"force"} - return sendchange('definitions_update',force) - else: - return sendchange('repo_update',properties) + repo_name = request.json['urls'][0] + changes = request.json['changes'] + for change in changes: + ref = change['ref'] + if repo_name == DEFINITIONS: + return sendchange('definitions_update',ref) + elif repo_name == TEST_REPO: + force = {"ref":"force"} + return sendchange('definitions_update',force) + else: + return sendchange('repo_update',properties) @post('/force_build') def force_build(): - force = {"force":"force"} + force = {"ref":"force"} return sendchange('definitions_update',force) @post('/build_complete') diff --git a/source/orch_config.py b/source/orch_config.py index 3b89afb..f760e45 100644 --- a/source/orch_config.py +++ b/source/orch_config.py @@ -46,7 +46,7 @@ columns = [ Column( name = "2. Build", category = "definitions_update", trigger = 'builders_trigger.sh', - properties = [("force","")], + properties = [("ref","cu010-trove/br6/firehose-test-1")], get_definitions = True), Column( name = "3. Deploy", category = "build_complete", |