| OLD | NEW |
| 1 { | 1 { |
| 2 "master_base_class": "Master1", | 2 "master_base_class": "Master1", |
| 3 "master_port": 8052, | 3 "master_port": 8052, |
| 4 "master_port_alt": 8252, | 4 "master_port_alt": 8252, |
| 5 "slave_port": 8152, | 5 "slave_port": 8152, |
| 6 "pubsub_service_account_file": "service-account-luci-milo.json", | 6 "pubsub_service_account_file": "service-account-luci-milo.json", |
| 7 "templates": ["templates", "../master.chromium/templates"], | 7 "templates": ["templates", "../master.chromium/templates"], |
| 8 | 8 |
| 9 "default_remote_run_properties": { |
| 10 "path_config": "kitchen", |
| 11 }, |
| 12 "default_remote_run_repository": "https://chromium.googlesource.com/chromium/t
ools/build.git", |
| 13 |
| 9 "builders": { | 14 "builders": { |
| 10 "Linux ChromiumOS Full": { | 15 "Linux ChromiumOS Full": { |
| 11 "recipe": "chromium", | 16 "recipe": "chromium", |
| 17 "use_remote_run": True, |
| 12 "scheduler": "chromium", | 18 "scheduler": "chromium", |
| 13 "slave_pools": ["linux_full"], | 19 "slave_pools": ["linux_full"], |
| 14 "category": "1default", | 20 "category": "1default", |
| 15 }, | 21 }, |
| 16 | 22 |
| 17 "Linux ChromiumOS Builder": { | 23 "Linux ChromiumOS Builder": { |
| 18 "recipe": "chromium", | 24 "recipe": "chromium", |
| 25 "use_remote_run": True, |
| 19 "scheduler": "chromium", | 26 "scheduler": "chromium", |
| 20 "slave_pools": ["linux_builder"], | 27 "slave_pools": ["linux_builder"], |
| 21 "category": "1default", | 28 "category": "1default", |
| 22 }, | 29 }, |
| 23 "Linux ChromiumOS Tests (1)": { | 30 "Linux ChromiumOS Tests (1)": { |
| 24 "recipe": "chromium", | 31 "recipe": "chromium", |
| 32 "use_remote_run": True, |
| 25 "scheduler": None, | 33 "scheduler": None, |
| 26 "slave_pools": ["linux_tester_1"], | 34 "slave_pools": ["linux_tester_1"], |
| 27 "category": "1default", | 35 "category": "1default", |
| 28 }, | 36 }, |
| 29 | 37 |
| 30 "Linux ChromiumOS GN": { | 38 "Linux ChromiumOS GN": { |
| 31 "recipe": "chromium", | 39 "recipe": "chromium", |
| 40 "use_remote_run": True, |
| 32 "scheduler": "chromium", | 41 "scheduler": "chromium", |
| 33 "slave_pools": ["linux_gn"], | 42 "slave_pools": ["linux_gn"], |
| 34 "category": "2gn", | 43 "category": "2gn", |
| 35 }, | 44 }, |
| 36 "Linux ChromiumOS GN (dbg)": { | 45 "Linux ChromiumOS GN (dbg)": { |
| 37 "recipe": "chromium", | 46 "recipe": "chromium", |
| 47 "use_remote_run": True, |
| 38 "scheduler": "chromium", | 48 "scheduler": "chromium", |
| 39 "slave_pools": ["linux_gn_dbg"], | 49 "slave_pools": ["linux_gn_dbg"], |
| 40 "category": "2gn", | 50 "category": "2gn", |
| 41 }, | 51 }, |
| 42 | 52 |
| 43 "Linux ChromiumOS Ozone Builder": { | 53 "Linux ChromiumOS Ozone Builder": { |
| 44 "recipe": "chromium", | 54 "recipe": "chromium", |
| 55 "use_remote_run": True, |
| 45 "scheduler": "chromium", | 56 "scheduler": "chromium", |
| 46 "slave_pools": ["linux_ozone"], | 57 "slave_pools": ["linux_ozone"], |
| 47 "category": "3ozone", | 58 "category": "3ozone", |
| 48 }, | 59 }, |
| 49 "Linux ChromiumOS Ozone Tests (1)": { | 60 "Linux ChromiumOS Ozone Tests (1)": { |
| 50 "recipe": "chromium", | 61 "recipe": "chromium", |
| 62 "use_remote_run": True, |
| 51 "scheduler": None, | 63 "scheduler": None, |
| 52 "slave_pools": ["linux_ozone_tests_1"], | 64 "slave_pools": ["linux_ozone_tests_1"], |
| 53 "category": "3ozone", | 65 "category": "3ozone", |
| 54 }, | 66 }, |
| 55 | 67 |
| 56 "Linux ChromiumOS Builder (dbg)": { | 68 "Linux ChromiumOS Builder (dbg)": { |
| 57 "recipe": "chromium", | 69 "recipe": "chromium", |
| 70 "use_remote_run": True, |
| 58 "scheduler": "chromium", | 71 "scheduler": "chromium", |
| 59 "slave_pools": ["linux_dbg"], | 72 "slave_pools": ["linux_dbg"], |
| 60 "category": "4debug", | 73 "category": "4debug", |
| 61 }, | 74 }, |
| 62 "Linux ChromiumOS Tests (dbg)(1)": { | 75 "Linux ChromiumOS Tests (dbg)(1)": { |
| 63 "recipe": "chromium", | 76 "recipe": "chromium", |
| 77 "use_remote_run": True, |
| 64 "scheduler": None, | 78 "scheduler": None, |
| 65 "slave_pools": ["linux_dbg_tests_1"], | 79 "slave_pools": ["linux_dbg_tests_1"], |
| 66 "category": "4debug", | 80 "category": "4debug", |
| 67 }, | 81 }, |
| 68 | 82 |
| 69 # Simplechrome CrOS builders. | 83 # Simplechrome CrOS builders. |
| 70 "ChromiumOS x86-generic Compile": { | 84 "ChromiumOS x86-generic Compile": { |
| 71 "recipe": "chromium", | 85 "recipe": "chromium", |
| 86 "use_remote_run": True, |
| 72 "scheduler": "chromium", | 87 "scheduler": "chromium", |
| 73 "slave_pools": ["linux_simplechrome_x86_generic"], | 88 "slave_pools": ["linux_simplechrome_x86_generic"], |
| 74 "category": "5simplechrome", | 89 "category": "5simplechrome", |
| 75 }, | 90 }, |
| 76 "ChromiumOS amd64-generic Compile": { | 91 "ChromiumOS amd64-generic Compile": { |
| 77 "recipe": "chromium", | 92 "recipe": "chromium", |
| 93 "use_remote_run": True, |
| 78 "scheduler": "chromium", | 94 "scheduler": "chromium", |
| 79 "slave_pools": ["linux_simplechrome_amd64_generic"], | 95 "slave_pools": ["linux_simplechrome_amd64_generic"], |
| 80 "category": "5simplechrome", | 96 "category": "5simplechrome", |
| 81 }, | 97 }, |
| 82 "ChromiumOS daisy Compile": { | 98 "ChromiumOS daisy Compile": { |
| 83 "recipe": "chromium", | 99 "recipe": "chromium", |
| 100 "use_remote_run": True, |
| 84 "scheduler": "chromium", | 101 "scheduler": "chromium", |
| 85 "slave_pools": ["linux_simplechrome_daisy"], | 102 "slave_pools": ["linux_simplechrome_daisy"], |
| 86 "category": "5simplechrome", | 103 "category": "5simplechrome", |
| 87 }, | 104 }, |
| 88 }, | 105 }, |
| 89 | 106 |
| 90 "schedulers": { | 107 "schedulers": { |
| 91 "chromium": { | 108 "chromium": { |
| 92 "type": "git_poller", | 109 "type": "git_poller", |
| 93 "git_repo_url": "https://chromium.googlesource.com/chromium/src", | 110 "git_repo_url": "https://chromium.googlesource.com/chromium/src", |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 "slave_data": { | 208 "slave_data": { |
| 192 "os": "linux", | 209 "os": "linux", |
| 193 "version": "precise", | 210 "version": "precise", |
| 194 "bits": 64, | 211 "bits": 64, |
| 195 }, | 212 }, |
| 196 "slaves": ["slave25-c1"], | 213 "slaves": ["slave25-c1"], |
| 197 }, | 214 }, |
| 198 }, | 215 }, |
| 199 } | 216 } |
| 200 | 217 |
| OLD | NEW |