| OLD | NEW | 
|    1 { |    1 { | 
|    2   "master_base_class": "Master4a", |    2   "master_base_class": "Master4a", | 
|    3   "master_port": 21401, |    3   "master_port": 21401, | 
|    4   "master_port_alt": 41401, |    4   "master_port_alt": 41401, | 
|    5   "slave_port": 31401, |    5   "slave_port": 31401, | 
|    6   "templates": ["templates", "../master.chromium/templates"], |    6   "templates": ["templates", "../master.chromium/templates"], | 
|    7  |    7  | 
|    8   "service_account_file": "service-account-chromium-tryserver.json", |    8   "service_account_file": "service-account-chromium-tryserver.json", | 
|    9   "buildbucket_bucket": "master.tryserver.chromium.android", |    9   "buildbucket_bucket": "master.tryserver.chromium.android", | 
|   10  |   10  | 
|   11   "default_properties": { |   11   "default_properties": { | 
|   12     "$recipe_engine": {"mode_flags": {"use_subprocess42": True}} |   12     "$recipe_engine": {"mode_flags": {"use_subprocess42": True}} | 
|   13   }, |   13   }, | 
|   14  |   14  | 
|   15   "default_remote_run_properties": { |   15   "default_remote_run_properties": { | 
|   16     "path_config": "kitchen", |   16     "path_config": "kitchen", | 
|   17   }, |   17   }, | 
|   18   "default_remote_run_repository": "https://chromium.googlesource.com/chromium/t
     ools/build.git", |   18   "default_remote_run_repository": "https://chromium.googlesource.com/chromium/t
     ools/build.git", | 
|   19  |   19  | 
|   20   # This is sorted first alphabetically by slave pool, and then alphabetically |   20   # This is sorted first alphabetically by slave pool, and then alphabetically | 
|   21   # by builder name |   21   # by builder name | 
|   22   "builders": { |   22   "builders": { | 
|   23     "android_compile_mips_dbg": { |   23     "android_compile_mips_dbg": { | 
|   24       "builder_timeout_s": 6900,  # 60 * 115 |   24       "builder_timeout_s": 6900,  # 60 * 115 | 
|   25       "recipe": "chromium_trybot", |   25       "recipe": "chromium_trybot", | 
|   26       "repository": "https://chromium.googlesource.com/chromium/src.git", |  | 
|   27       "remote_run_use_gitiles": True, |   26       "remote_run_use_gitiles": True, | 
|   28       "use_remote_run": True, |   27       "use_remote_run": True, | 
|   29       "scheduler": None, |   28       "scheduler": None, | 
|   30       "slave_pools": ["ccompute_optional_bots"], |   29       "slave_pools": ["ccompute_optional_bots"], | 
|   31       "slavebuilddir": "android_compile_mips_dbg", |   30       "slavebuilddir": "android_compile_mips_dbg", | 
|   32     }, |   31     }, | 
|   33     "android_compile_x64_dbg": { |   32     "android_compile_x64_dbg": { | 
|   34       "builder_timeout_s": 6900,  # 60 * 115 |   33       "builder_timeout_s": 6900,  # 60 * 115 | 
|   35       "recipe": "chromium_trybot", |   34       "recipe": "chromium_trybot", | 
|   36       "repository": "https://chromium.googlesource.com/chromium/src.git", |  | 
|   37       "remote_run_use_gitiles": True, |   35       "remote_run_use_gitiles": True, | 
|   38       "use_remote_run": True, |   36       "use_remote_run": True, | 
|   39       "scheduler": None, |   37       "scheduler": None, | 
|   40       "slave_pools": ["ccompute_optional_bots"], |   38       "slave_pools": ["ccompute_optional_bots"], | 
|   41       "slavebuilddir": "android_compile_x64_dbg", |   39       "slavebuilddir": "android_compile_x64_dbg", | 
|   42     }, |   40     }, | 
|   43     "android_compile_x86_dbg": { |   41     "android_compile_x86_dbg": { | 
|   44       "builder_timeout_s": 6900,  # 60 * 115 |   42       "builder_timeout_s": 6900,  # 60 * 115 | 
|   45       "recipe": "chromium_trybot", |   43       "recipe": "chromium_trybot", | 
|   46       "repository": "https://chromium.googlesource.com/chromium/src.git", |  | 
|   47       "remote_run_use_gitiles": True, |   44       "remote_run_use_gitiles": True, | 
|   48       "use_remote_run": True, |   45       "use_remote_run": True, | 
|   49       "scheduler": None, |   46       "scheduler": None, | 
|   50       "slave_pools": ["ccompute_optional_bots"], |   47       "slave_pools": ["ccompute_optional_bots"], | 
|   51       "slavebuilddir": "android_compile_x86_dbg", |   48       "slavebuilddir": "android_compile_x86_dbg", | 
|   52     }, |   49     }, | 
|   53     "android_archive_rel_ng": { |   50     "android_archive_rel_ng": { | 
|   54       "builder_timeout_s": 6900,  # 60 * 115 |   51       "builder_timeout_s": 6900,  # 60 * 115 | 
|   55       "recipe": "chromium_trybot", |   52       "recipe": "chromium_trybot", | 
|   56       "repository": "https://chromium.googlesource.com/chromium/src.git", |  | 
|   57       "remote_run_use_gitiles": True, |   53       "remote_run_use_gitiles": True, | 
|   58       "use_remote_run": True, |   54       "use_remote_run": True, | 
|   59       "scheduler": None, |   55       "scheduler": None, | 
|   60       "slave_pools": ["ccompute_bots_cq"], |   56       "slave_pools": ["ccompute_bots_cq"], | 
|   61     }, |   57     }, | 
|   62     "android_arm64_dbg_recipe": { |   58     "android_arm64_dbg_recipe": { | 
|   63       "builder_timeout_s": 6900,  # 60 * 115 |   59       "builder_timeout_s": 6900,  # 60 * 115 | 
|   64       "recipe": "chromium_trybot", |   60       "recipe": "chromium_trybot", | 
|   65       "repository": "https://chromium.googlesource.com/chromium/src.git", |  | 
|   66       "remote_run_use_gitiles": True, |   61       "remote_run_use_gitiles": True, | 
|   67       "use_remote_run": True, |   62       "use_remote_run": True, | 
|   68       "scheduler": None, |   63       "scheduler": None, | 
|   69       "slave_pools": ["ccompute_bots_cq"], |   64       "slave_pools": ["ccompute_bots_cq"], | 
|   70     }, |   65     }, | 
|   71     "android_clang_dbg_recipe": { |   66     "android_clang_dbg_recipe": { | 
|   72       "builder_timeout_s": 6900,  # 60 * 115 |   67       "builder_timeout_s": 6900,  # 60 * 115 | 
|   73       "recipe": "chromium_trybot", |   68       "recipe": "chromium_trybot", | 
|   74       "repository": "https://chromium.googlesource.com/chromium/src.git", |  | 
|   75       "remote_run_use_gitiles": True, |   69       "remote_run_use_gitiles": True, | 
|   76       "use_remote_run": True, |   70       "use_remote_run": True, | 
|   77       "scheduler": None, |   71       "scheduler": None, | 
|   78       "slave_pools": ["ccompute_bots_cq"], |   72       "slave_pools": ["ccompute_bots_cq"], | 
|   79     }, |   73     }, | 
|   80     "android_compile_dbg": { |   74     "android_compile_dbg": { | 
|   81       "builder_timeout_s": 6900,  # 60 * 115 |   75       "builder_timeout_s": 6900,  # 60 * 115 | 
|   82       "recipe": "chromium_trybot", |   76       "recipe": "chromium_trybot", | 
|   83       "repository": "https://chromium.googlesource.com/chromium/src.git", |  | 
|   84       "remote_run_use_gitiles": True, |   77       "remote_run_use_gitiles": True, | 
|   85       "use_remote_run": True, |   78       "use_remote_run": True, | 
|   86       "scheduler": None, |   79       "scheduler": None, | 
|   87       "slavebuilddir": "android", |   80       "slavebuilddir": "android", | 
|   88       "slave_pools": ["ccompute_bots_cq"], |   81       "slave_pools": ["ccompute_bots_cq"], | 
|   89     }, |   82     }, | 
|   90     "android_compile_rel": { |   83     "android_compile_rel": { | 
|   91       "builder_timeout_s": 6900,  # 60 * 115 |   84       "builder_timeout_s": 6900,  # 60 * 115 | 
|   92       "recipe": "chromium_trybot", |   85       "recipe": "chromium_trybot", | 
|   93       "repository": "https://chromium.googlesource.com/chromium/src.git", |  | 
|   94       "remote_run_use_gitiles": True, |   86       "remote_run_use_gitiles": True, | 
|   95       "use_remote_run": True, |   87       "use_remote_run": True, | 
|   96       "scheduler": None, |   88       "scheduler": None, | 
|   97       "slavebuilddir": "android", |   89       "slavebuilddir": "android", | 
|   98       "slave_pools": ["ccompute_bots_cq"], |   90       "slave_pools": ["ccompute_bots_cq"], | 
|   99     }, |   91     }, | 
|  100     "cast_shell_android": { |   92     "cast_shell_android": { | 
|  101       "builder_timeout_s": 6900,  # 60 * 115 |   93       "builder_timeout_s": 6900,  # 60 * 115 | 
|  102       "recipe": "chromium_trybot", |   94       "recipe": "chromium_trybot", | 
|  103       "repository": "https://chromium.googlesource.com/chromium/src.git", |  | 
|  104       "remote_run_use_gitiles": True, |   95       "remote_run_use_gitiles": True, | 
|  105       "use_remote_run": True, |   96       "use_remote_run": True, | 
|  106       "scheduler": None, |   97       "scheduler": None, | 
|  107       "slave_pools": ["ccompute_bots_cq"], |   98       "slave_pools": ["ccompute_bots_cq"], | 
|  108     }, |   99     }, | 
|  109     "android_blink_rel": { |  100     "android_blink_rel": { | 
|  110       "builder_timeout_s": 6900,  # 60 * 115 |  101       "builder_timeout_s": 6900,  # 60 * 115 | 
|  111       "recipe": "chromium_trybot", |  102       "recipe": "chromium_trybot", | 
|  112       "repository": "https://chromium.googlesource.com/chromium/src.git", |  | 
|  113       "remote_run_use_gitiles": True, |  103       "remote_run_use_gitiles": True, | 
|  114       "use_remote_run": True, |  104       "use_remote_run": True, | 
|  115       "scheduler": None, |  105       "scheduler": None, | 
|  116       "slave_pools": ["slaves_with_devices"], |  106       "slave_pools": ["slaves_with_devices"], | 
|  117     }, |  107     }, | 
|  118     "android_coverage": { |  108     "android_coverage": { | 
|  119       "builder_timeout_s": 6900,  # 60 * 115 |  109       "builder_timeout_s": 6900,  # 60 * 115 | 
|  120       "recipe": "chromium_trybot", |  110       "recipe": "chromium_trybot", | 
|  121       "repository": "https://chromium.googlesource.com/chromium/src.git", |  | 
|  122       "remote_run_use_gitiles": True, |  111       "remote_run_use_gitiles": True, | 
|  123       "use_remote_run": True, |  112       "use_remote_run": True, | 
|  124       "scheduler": None, |  113       "scheduler": None, | 
|  125       "slavebuilddir": "android", |  114       "slavebuilddir": "android", | 
|  126       "slave_pools": ["slaves_with_devices"], |  115       "slave_pools": ["slaves_with_devices"], | 
|  127     }, |  116     }, | 
|  128     "android_cronet": { |  117     "android_cronet": { | 
|  129       "builder_timeout_s": 6900,  # 60 * 115 |  118       "builder_timeout_s": 6900,  # 60 * 115 | 
|  130       "recipe": "chromium_trybot", |  119       "recipe": "chromium_trybot", | 
|  131       "use_remote_run": True, |  120       "use_remote_run": True, | 
|  132       "scheduler": None, |  121       "scheduler": None, | 
|  133       "slavebuildder": "cronet", |  122       "slavebuildder": "cronet", | 
|  134       "slave_pools": ["ccompute_bots_cq"], |  123       "slave_pools": ["ccompute_bots_cq"], | 
|  135     }, |  124     }, | 
|  136     "android_cronet_tester": { |  125     "android_cronet_tester": { | 
|  137       "builder_timeout_s": 6900,  # 60 * 115 |  126       "builder_timeout_s": 6900,  # 60 * 115 | 
|  138       "recipe": "cronet", |  127       "recipe": "cronet", | 
|  139       "scheduler": None, |  128       "scheduler": None, | 
|  140       "slave_pools": ["slaves_with_devices"], |  129       "slave_pools": ["slaves_with_devices"], | 
|  141     }, |  130     }, | 
|  142     "linux_android_dbg_ng": { |  131     "linux_android_dbg_ng": { | 
|  143       "builder_timeout_s": 6900,  # 60 * 115 |  132       "builder_timeout_s": 6900,  # 60 * 115 | 
|  144       "recipe": "chromium_trybot", |  133       "recipe": "chromium_trybot", | 
|  145       "repository": "https://chromium.googlesource.com/chromium/src.git", |  | 
|  146       "remote_run_use_gitiles": True, |  134       "remote_run_use_gitiles": True, | 
|  147       "use_remote_run": True, |  135       "use_remote_run": True, | 
|  148       "scheduler": None, |  136       "scheduler": None, | 
|  149       "slavebuilddir": "android", |  137       "slavebuilddir": "android", | 
|  150       "slave_pools": ["slaves_with_devices"], |  138       "slave_pools": ["slaves_with_devices"], | 
|  151     }, |  139     }, | 
|  152     "linux_android_rel_ng": { |  140     "linux_android_rel_ng": { | 
|  153       "builder_timeout_s": 11400,  # 60 * 190 |  141       "builder_timeout_s": 11400,  # 60 * 190 | 
|  154       "recipe": "chromium_trybot", |  142       "recipe": "chromium_trybot", | 
|  155       "repository": "https://chromium.googlesource.com/chromium/src.git", |  | 
|  156       "remote_run_use_gitiles": True, |  143       "remote_run_use_gitiles": True, | 
|  157       "use_remote_run": True, |  144       "use_remote_run": True, | 
|  158       "scheduler": None, |  145       "scheduler": None, | 
|  159       "slavebuilddir": "android", |  146       "slavebuilddir": "android", | 
|  160       "slave_pools": ["ccompute_android_launch"], |  147       "slave_pools": ["ccompute_android_launch"], | 
|  161     }, |  148     }, | 
|  162     "android_n5x_swarming_rel": { |  149     "android_n5x_swarming_rel": { | 
|  163       "builder_timeout_s": 6900,  # 60 * 115 |  150       "builder_timeout_s": 6900,  # 60 * 115 | 
|  164       "recipe": "chromium_trybot", |  151       "recipe": "chromium_trybot", | 
|  165       "repository": "https://chromium.googlesource.com/chromium/src.git", |  | 
|  166       "remote_run_use_gitiles": True, |  152       "remote_run_use_gitiles": True, | 
|  167       "use_remote_run": True, |  153       "use_remote_run": True, | 
|  168       "scheduler": None, |  154       "scheduler": None, | 
|  169       "slavebuilddir": "android_arm64", |  155       "slavebuilddir": "android_arm64", | 
|  170       "slave_pools": ["ccompute_android_launch"], |  156       "slave_pools": ["ccompute_android_launch"], | 
|  171     }, |  157     }, | 
|  172     "android_chromium_variable": { |  158     "android_chromium_variable": { | 
|  173       "builder_timeout_s": 36000,  # 60 * 600 |  159       "builder_timeout_s": 36000,  # 60 * 600 | 
|  174       "recipe": "findit/chromium/compile", |  160       "recipe": "findit/chromium/compile", | 
|  175       "use_remote_run": True, |  161       "use_remote_run": True, | 
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  221       "builder_timeout_s": 36000,  # 60 * 600 |  207       "builder_timeout_s": 36000,  # 60 * 600 | 
|  222       "recipe": "findit/chromium/compile", |  208       "recipe": "findit/chromium/compile", | 
|  223       "use_remote_run": True, |  209       "use_remote_run": True, | 
|  224       "scheduler": None, |  210       "scheduler": None, | 
|  225       "slavebuilddir": "android_chromium_variable_archive", |  211       "slavebuilddir": "android_chromium_variable_archive", | 
|  226       "slave_pools": ["ccompute_optional_bots"], |  212       "slave_pools": ["ccompute_optional_bots"], | 
|  227     }, |  213     }, | 
|  228     "android_optional_gpu_tests_rel": { |  214     "android_optional_gpu_tests_rel": { | 
|  229       "builder_timeout_s": 6900,  # 60 * 115 |  215       "builder_timeout_s": 6900,  # 60 * 115 | 
|  230       "recipe": "chromium_trybot", |  216       "recipe": "chromium_trybot", | 
|  231       "repository": "https://chromium.googlesource.com/chromium/src.git", |  | 
|  232       "remote_run_use_gitiles": True, |  217       "remote_run_use_gitiles": True, | 
|  233       "use_remote_run": True, |  218       "use_remote_run": True, | 
|  234       "scheduler": None, |  219       "scheduler": None, | 
|  235       "slavebuilddir": "android", |  220       "slavebuilddir": "android", | 
|  236       "slave_pools": ["ccompute_android_launch"], |  221       "slave_pools": ["ccompute_android_launch"], | 
|  237     }, |  222     }, | 
|  238   }, |  223   }, | 
|  239  |  224  | 
|  240   "schedulers": { }, |  225   "schedulers": { }, | 
|  241  |  226  | 
| (...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  557         "os": "linux", |  542         "os": "linux", | 
|  558         "version": "trusty", |  543         "version": "trusty", | 
|  559         "bits": 64, |  544         "bits": 64, | 
|  560       }, |  545       }, | 
|  561       "slaves": [ |  546       "slaves": [ | 
|  562         "build35-b4", |  547         "build35-b4", | 
|  563       ], |  548       ], | 
|  564     } |  549     } | 
|  565   } |  550   } | 
|  566 } |  551 } | 
| OLD | NEW |