| OLD | NEW |
| 1 { | 1 { |
| 2 "master_base_class": "Master4a", | 2 "master_base_class": "Master4a", |
| 3 "master_classname": "CatapultTryserver", | 3 "master_classname": "CatapultTryserver", |
| 4 "master_port": 21400, | 4 "master_port": 21400, |
| 5 "master_port_alt": 41400, | 5 "master_port_alt": 41400, |
| 6 "slave_port": 31400, | 6 "slave_port": 31400, |
| 7 "templates": ["../master.chromium/templates"], | 7 "templates": ["../master.chromium/templates"], |
| 8 | 8 |
| 9 "service_account_file": "service-account-chromium-tryserver.json", | 9 "service_account_file": "service-account-chromium-tryserver.json", |
| 10 "buildbucket_bucket": "master.tryserver.client.catapult", | 10 "buildbucket_bucket": "master.tryserver.client.catapult", |
| 11 | 11 |
| 12 "builders": { | 12 "builders": { |
| 13 "Catapult Presubmit": { | 13 "Catapult Presubmit": { |
| 14 "recipe": "run_presubmit", | 14 "recipe": "run_presubmit", |
| 15 "properties": { | 15 "properties": { |
| 16 "repo_name": "catapult", | 16 "repo_name": "catapult", |
| 17 }, | 17 }, |
| 18 "scheduler": None, | 18 "scheduler": None, |
| 19 "slave_pools": ["linux_slave_pool"], | 19 "slave_pools": ["linux_slave_pool"], |
| 20 "slavebuilddir": "presubmit_catapult", | 20 "slavebuilddir": "presubmit_catapult", |
| 21 }, | 21 }, |
| 22 "Catapult Android Tryserver": { |
| 23 "recipe": "catapult", |
| 24 "scheduler": None, |
| 25 "slave_pools": ["android_slave_pool"], |
| 26 "slavebuilddir": "catapult", |
| 27 "properties": { |
| 28 "platform": "android", |
| 29 }, |
| 30 }, |
| 22 "Catapult Linux Tryserver": { | 31 "Catapult Linux Tryserver": { |
| 23 "recipe": "catapult", | 32 "recipe": "catapult", |
| 24 "scheduler": None, | 33 "scheduler": None, |
| 25 "slave_pools": ["linux_slave_pool"], | 34 "slave_pools": ["linux_slave_pool"], |
| 26 | 35 |
| 27 "slavebuilddir": "catapult", | 36 "slavebuilddir": "catapult", |
| 28 }, | 37 }, |
| 29 "Catapult Mac Tryserver": { | 38 "Catapult Mac Tryserver": { |
| 30 "recipe": "catapult", | 39 "recipe": "catapult", |
| 31 "scheduler": None, | 40 "scheduler": None, |
| 32 "slave_pools": ["mac_slave_pool"], | 41 "slave_pools": ["mac_slave_pool"], |
| 33 | 42 |
| 34 "slavebuilddir": "catapult", | 43 "slavebuilddir": "catapult", |
| 35 }, | 44 }, |
| 36 "Catapult Windows Tryserver": { | 45 "Catapult Windows Tryserver": { |
| 37 "recipe": "catapult", | 46 "recipe": "catapult", |
| 38 "scheduler": None, | 47 "scheduler": None, |
| 39 "slave_pools": ["win_slave_pool"], | 48 "slave_pools": ["win_slave_pool"], |
| 40 | 49 |
| 41 "slavebuilddir": "catapult", | 50 "slavebuilddir": "catapult", |
| 42 }, | 51 }, |
| 43 }, | 52 }, |
| 44 | 53 |
| 45 "schedulers": {}, | 54 "schedulers": {}, |
| 46 | 55 |
| 47 "slave_pools": { | 56 "slave_pools": { |
| 57 "android_slave_pool": { |
| 58 "slave_data": { |
| 59 "bits": 64, |
| 60 "os": "linux", |
| 61 "version": "precise", |
| 62 }, |
| 63 "slaves": [ |
| 64 "build1-b3", |
| 65 "build37-b4", |
| 66 ], |
| 67 }, |
| 48 "linux_slave_pool": { | 68 "linux_slave_pool": { |
| 49 "slave_data": { | 69 "slave_data": { |
| 50 "bits": 64, | 70 "bits": 64, |
| 51 "os": "linux", | 71 "os": "linux", |
| 52 "version": "precise", | 72 "version": "precise", |
| 53 }, | 73 }, |
| 54 "slaves": ["slave425-c4"], | 74 "slaves": ["slave425-c4"], |
| 55 }, | 75 }, |
| 56 "mac_slave_pool": { | 76 "mac_slave_pool": { |
| 57 "slave_data": { | 77 "slave_data": { |
| 58 "bits": 64, | 78 "bits": 64, |
| 59 "os": "mac", | 79 "os": "mac", |
| 60 "version": "10.9", | 80 "version": "10.9", |
| 61 }, | 81 }, |
| 62 "slaves": ["vm600-m4"], | 82 "slaves": ["vm600-m4"], |
| 63 }, | 83 }, |
| 64 "win_slave_pool": { | 84 "win_slave_pool": { |
| 65 "slave_data": { | 85 "slave_data": { |
| 66 "bits": 64, | 86 "bits": 64, |
| 67 "os": "win", | 87 "os": "win", |
| 68 "version": "win10", | 88 "version": "win10", |
| 69 }, | 89 }, |
| 70 "slaves": ["build78-b1", "build79-b1"], | 90 "slaves": ["build78-b1", "build79-b1"], |
| 71 }, | 91 }, |
| 72 }, | 92 }, |
| 73 } | 93 } |
| OLD | NEW |