| 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 "builder_timeout_s": 300, # 5 minutes max | 21 "builder_timeout_s": 300, # 5 minutes max |
| 22 }, | 22 }, |
| 23 "Catapult Android Tryserver": { | 23 "Catapult Android N5X M Tryserver": { |
| 24 "recipe": "catapult", |
| 25 "scheduler": None, |
| 26 "slave_pools": ["android_n5x_slave_pool"], |
| 27 "slavebuilddir": "catapult", |
| 28 "properties": { |
| 29 "platform": "android", |
| 30 }, |
| 31 "builder_timeout_s": 1200, # 20 minutes max |
| 32 }, |
| 33 "Catapult Android N5 K Tryserver": { |
| 24 "recipe": "catapult", | 34 "recipe": "catapult", |
| 25 "scheduler": None, | 35 "scheduler": None, |
| 26 "slave_pools": ["android_slave_pool"], | 36 "slave_pools": ["android_slave_pool"], |
| 27 "slavebuilddir": "catapult", | 37 "slavebuilddir": "catapult", |
| 28 "properties": { | 38 "properties": { |
| 29 "platform": "android", | 39 "platform": "android", |
| 30 }, | 40 }, |
| 31 "builder_timeout_s": 1200, # 20 minutes max | 41 "builder_timeout_s": 1200, # 20 minutes max |
| 32 }, | 42 }, |
| 33 "Catapult Linux Tryserver": { | 43 "Catapult Linux Tryserver": { |
| (...skipping 18 matching lines...) Expand all Loading... |
| 52 "slave_pools": ["win_slave_pool"], | 62 "slave_pools": ["win_slave_pool"], |
| 53 | 63 |
| 54 "slavebuilddir": "catapult", | 64 "slavebuilddir": "catapult", |
| 55 "builder_timeout_s": 2400, # 40 minutes max | 65 "builder_timeout_s": 2400, # 40 minutes max |
| 56 }, | 66 }, |
| 57 }, | 67 }, |
| 58 | 68 |
| 59 "schedulers": {}, | 69 "schedulers": {}, |
| 60 | 70 |
| 61 "slave_pools": { | 71 "slave_pools": { |
| 62 "android_slave_pool": { | 72 "android_n5_slave_pool": { |
| 63 "slave_data": { | 73 "slave_data": { |
| 64 "bits": 64, | 74 "bits": 64, |
| 65 "os": "linux", | 75 "os": "linux", |
| 76 "version": "trusty", |
| 77 }, |
| 78 "slaves": [ |
| 79 "build222-b4", |
| 80 ], |
| 81 }, |
| 82 "android_n5x_slave_pool": { |
| 83 "slave_data": { |
| 84 "bits": 64, |
| 85 "os": "linux", |
| 66 "version": "precise", | 86 "version": "precise", |
| 67 }, | 87 }, |
| 68 "slaves": [ | 88 "slaves": [ |
| 69 "build1-b3", | 89 "build1-b3", |
| 70 "build37-b4", | 90 "build37-b4", |
| 71 ], | 91 ], |
| 72 }, | 92 }, |
| 73 "linux_slave_pool": { | 93 "linux_slave_pool": { |
| 74 "slave_data": { | 94 "slave_data": { |
| 75 "bits": 64, | 95 "bits": 64, |
| (...skipping 19 matching lines...) Expand all Loading... |
| 95 "win_slave_pool": { | 115 "win_slave_pool": { |
| 96 "slave_data": { | 116 "slave_data": { |
| 97 "bits": 64, | 117 "bits": 64, |
| 98 "os": "win", | 118 "os": "win", |
| 99 "version": "win10", | 119 "version": "win10", |
| 100 }, | 120 }, |
| 101 "slaves": ["build78-b1", "build79-b1"], | 121 "slaves": ["build78-b1", "build79-b1"], |
| 102 }, | 122 }, |
| 103 }, | 123 }, |
| 104 } | 124 } |
| OLD | NEW |