| OLD | NEW |
| 1 { | 1 { |
| 2 "master_base_class": "Master1", | 2 "master_base_class": "Master1", |
| 3 "master_port": 20100, | 3 "master_port": 20100, |
| 4 "master_port_alt": 40100, | 4 "master_port_alt": 40100, |
| 5 "slave_port": 30100, | 5 "slave_port": 30100, |
| 6 "templates": ["../master.chromium/templates"], | 6 "templates": ["../master.chromium/templates"], |
| 7 | 7 |
| 8 "builders": { | 8 "builders": { |
| 9 "Chromium Mojo Linux": { | 9 "Chromium Mojo Linux": { |
| 10 "recipe": "chromium_mojo", | 10 "recipe": "chromium", |
| 11 "scheduler": "chromium_commits", | 11 "scheduler": "chromium_commits", |
| 12 "slave_pools": ["linux_precise"], | 12 "slave_pools": ["linux_precise"], |
| 13 | |
| 14 "slavebuilddir": "chromium_mojo", | |
| 15 }, | 13 }, |
| 16 "Chromium Mojo Android": { | 14 "Chromium Mojo Android": { |
| 17 "recipe": "chromium_mojo", | 15 "recipe": "chromium", |
| 18 "scheduler": "chromium_commits", | 16 "scheduler": "chromium_commits", |
| 19 "slave_pools": ["linux_precise_android"], | 17 "slave_pools": ["linux_precise_android"], |
| 20 | |
| 21 "slavebuilddir": "chromium_mojo", | |
| 22 }, | 18 }, |
| 23 "Chromium Mojo Windows": { | 19 "Chromium Mojo Windows": { |
| 24 "recipe": "chromium_mojo", | 20 "recipe": "chromium", |
| 25 "scheduler": "chromium_commits", | 21 "scheduler": "chromium_commits", |
| 26 "slave_pools": ["windows_7"], | 22 "slave_pools": ["windows_7"], |
| 27 | |
| 28 "slavebuilddir": "chromium_mojo", | |
| 29 }, | 23 }, |
| 30 }, | 24 }, |
| 31 | 25 |
| 32 "schedulers": { | 26 "schedulers": { |
| 33 "chromium_commits": { | 27 "chromium_commits": { |
| 34 "type": "git_poller", | 28 "type": "git_poller", |
| 35 "git_repo_url": "https://chromium.googlesource.com/chromium/src.git", | 29 "git_repo_url": "https://chromium.googlesource.com/chromium/src.git", |
| 36 }, | 30 }, |
| 37 }, | 31 }, |
| 38 | 32 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 56 "windows_7": { | 50 "windows_7": { |
| 57 "slave_data": { | 51 "slave_data": { |
| 58 "bits": 64, | 52 "bits": 64, |
| 59 "os": "win", | 53 "os": "win", |
| 60 "version": "win7", | 54 "version": "win7", |
| 61 }, | 55 }, |
| 62 "slaves": ["vm16-m1"], | 56 "slaves": ["vm16-m1"], |
| 63 }, | 57 }, |
| 64 }, | 58 }, |
| 65 } | 59 } |
| OLD | NEW |