| 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 }, | 22 }, |
| 22 "Catapult Android Tryserver": { | 23 "Catapult Android Tryserver": { |
| 23 "recipe": "catapult", | 24 "recipe": "catapult", |
| 24 "scheduler": None, | 25 "scheduler": None, |
| 25 "slave_pools": ["android_slave_pool"], | 26 "slave_pools": ["android_slave_pool"], |
| 26 "slavebuilddir": "catapult", | 27 "slavebuilddir": "catapult", |
| 27 "properties": { | 28 "properties": { |
| 28 "platform": "android", | 29 "platform": "android", |
| 29 }, | 30 }, |
| 31 "builder_timeout_s": 1200, # 20 minutes max |
| 30 }, | 32 }, |
| 31 "Catapult Linux Tryserver": { | 33 "Catapult Linux Tryserver": { |
| 32 "recipe": "catapult", | 34 "recipe": "catapult", |
| 33 "scheduler": None, | 35 "scheduler": None, |
| 34 "slave_pools": ["linux_slave_pool"], | 36 "slave_pools": ["linux_slave_pool"], |
| 35 | 37 |
| 36 "slavebuilddir": "catapult", | 38 "slavebuilddir": "catapult", |
| 39 "builder_timeout_s": 1800, # 30 minutes max |
| 37 }, | 40 }, |
| 38 "Catapult Mac Tryserver": { | 41 "Catapult Mac Tryserver": { |
| 39 "recipe": "catapult", | 42 "recipe": "catapult", |
| 40 "scheduler": None, | 43 "scheduler": None, |
| 41 "slave_pools": ["mac_slave_pool"], | 44 "slave_pools": ["mac_slave_pool"], |
| 42 | 45 |
| 43 "slavebuilddir": "catapult", | 46 "slavebuilddir": "catapult", |
| 47 "builder_timeout_s": 1800, # 30 minutes max |
| 44 }, | 48 }, |
| 45 "Catapult Windows Tryserver": { | 49 "Catapult Windows Tryserver": { |
| 46 "recipe": "catapult", | 50 "recipe": "catapult", |
| 47 "scheduler": None, | 51 "scheduler": None, |
| 48 "slave_pools": ["win_slave_pool"], | 52 "slave_pools": ["win_slave_pool"], |
| 49 | 53 |
| 50 "slavebuilddir": "catapult", | 54 "slavebuilddir": "catapult", |
| 55 "builder_timeout_s": 2400, # 40 minutes max |
| 51 }, | 56 }, |
| 52 }, | 57 }, |
| 53 | 58 |
| 54 "schedulers": {}, | 59 "schedulers": {}, |
| 55 | 60 |
| 56 "slave_pools": { | 61 "slave_pools": { |
| 57 "android_slave_pool": { | 62 "android_slave_pool": { |
| 58 "slave_data": { | 63 "slave_data": { |
| 59 "bits": 64, | 64 "bits": 64, |
| 60 "os": "linux", | 65 "os": "linux", |
| (...skipping 23 matching lines...) Expand all Loading... |
| 84 "win_slave_pool": { | 89 "win_slave_pool": { |
| 85 "slave_data": { | 90 "slave_data": { |
| 86 "bits": 64, | 91 "bits": 64, |
| 87 "os": "win", | 92 "os": "win", |
| 88 "version": "win10", | 93 "version": "win10", |
| 89 }, | 94 }, |
| 90 "slaves": ["build78-b1", "build79-b1"], | 95 "slaves": ["build78-b1", "build79-b1"], |
| 91 }, | 96 }, |
| 92 }, | 97 }, |
| 93 } | 98 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2182493002:
Add per-builder timeouts to catapult waterfall (Closed)
Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master