diff options
| author | Will Holland <william.holland@codethink.co.uk> | 2015-09-21 14:35:16 +0100 |
|---|---|---|
| committer | Will Holland <william.holland@codethink.co.uk> | 2015-09-21 14:35:16 +0100 |
| commit | a045af74d6e1667b15c674edcc0183eb71efc73f (patch) | |
| tree | 23b5d9784f90094a028198d35eb356fb11bce190 | |
| parent | bc5e171ca9512d243bab82f66b830fac671eda4b (diff) | |
| download | orchestration-a045af74d6e1667b15c674edcc0183eb71efc73f.tar.gz | |
Add additional slave and filter by branch
| -rw-r--r-- | source/bottlerock.py | 5 | ||||
| -rw-r--r-- | source/orch_config.py | 19 |
2 files changed, 17 insertions, 7 deletions
diff --git a/source/bottlerock.py b/source/bottlerock.py index b6eb4fa..c0c6c39 100644 --- a/source/bottlerock.py +++ b/source/bottlerock.py @@ -79,8 +79,9 @@ def repo_update(): # if baseref changes trigger firehose properties = {'repo_name':repo_name,'ref':ref} return sendchange('repo_update',properties) - else: - return sendchange('definitions_update',ref) + elif ref in orch_config.candidate_refs.keys(): + slave = orch_config.candidate_refs[ref] + return sendchange('definitions_update_%s' % slave,ref) elif repo_name == TEST_REPO: force = {"ref":"force"} return sendchange('definitions_update',force) diff --git a/source/orch_config.py b/source/orch_config.py index 6e9f77a..f52a460 100644 --- a/source/orch_config.py +++ b/source/orch_config.py @@ -1,6 +1,7 @@ categories = [ 'repo_update', - 'definitions_update', + 'definitions_update_local-slave', + 'definitions_update_arm-slave', 'build_complete', 'deploy_complete'] @@ -47,13 +48,19 @@ columns = [ slavenames=["local-slave"], properties = [('repo_name','no repo name given'), ('ref','no ref given')]), - Column( name = "2. Build", - category = "definitions_update", + Column( name = "2. x86_64 Build", + category = "definitions_update_local-slave", trigger = 'builders_trigger.sh', slavenames=["local-slave"], properties = [("ref","cu010-trove/br6/firehose-test-1")], get_definitions = True), - Column( name = "3. Deploy", + Column( name = "3. ARM Build", + category = "definitions_update_arm-slave", + trigger = 'builders_trigger.sh', + slavenames=["arm-slave"], + properties = [("ref","cu010-trove/arm-base")], + get_definitions = True), + Column( name = "4. x86_64 Deploy", category = "build_complete", trigger = 'deploy_trigger.sh', slavenames=["local-slave"], @@ -64,7 +71,7 @@ columns = [ ('definitions_sha','no definitions SHA given'), ('testing_sha','no testing SHA given')], get_definitions = True), - Column( name = "4. Test", + Column( name = "5. Test", category = "deploy_complete", trigger = 'testing_trigger.sh', slavenames=["local-slave"], @@ -77,6 +84,8 @@ deploy_timeout = 1800 web_user = "codething" web_user_password = "password" definitions_base_ref = "cu010-trove/br6/genivi-demo-platform" +candidate_refs = {"cu010-trove/br6/firehose-test-1":"local-slave", + "cu010-trove/arm-base":"arm-slave"} slaves = [ {'name':'local-slave','password':'pass'}, {'name':'arm-slave','password':'pass'}] |