| OLD | NEW |
| 1 { | 1 { |
| 2 "master_base_class": "Master1", | 2 "master_base_class": "Master1", |
| 3 "master_port": 20101, | 3 "master_port": 20101, |
| 4 "master_port_alt": 40101, | 4 "master_port_alt": 40101, |
| 5 "slave_port": 30101, | 5 "slave_port": 30101, |
| 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": { | 9 "default_remote_run_properties": { |
| 10 "path_config": "kitchen", | 10 "path_config": "kitchen", |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 "Android N5X Swarm Builder": { | 186 "Android N5X Swarm Builder": { |
| 187 "recipe": "chromium", | 187 "recipe": "chromium", |
| 188 "remote_run_sync_revision": True, | 188 "remote_run_sync_revision": True, |
| 189 "remote_run_use_gitiles": True, | 189 "remote_run_use_gitiles": True, |
| 190 "use_remote_run": True, | 190 "use_remote_run": True, |
| 191 "scheduler": "android_commits", | 191 "scheduler": "android_commits", |
| 192 "slave_pools": ["main_n5x_builder"], | 192 "slave_pools": ["main_n5x_builder"], |
| 193 "category": "4Swarming", | 193 "category": "4Swarming", |
| 194 "slavebuilddir": "android_build", | 194 "slavebuilddir": "android_build", |
| 195 }, | 195 }, |
| 196 "Jelly Bean Tester": { | |
| 197 "recipe": "chromium", | |
| 198 "remote_run_sync_revision": True, | |
| 199 "remote_run_use_gitiles": True, | |
| 200 "use_remote_run": True, | |
| 201 "scheduler": None, | |
| 202 "slave_pools": ["jelly_bean_tester"], | |
| 203 "category": "3Testers", | |
| 204 "mergeRequests": True, | |
| 205 }, | |
| 206 "KitKat Tablet Tester": { | 196 "KitKat Tablet Tester": { |
| 207 "recipe": "chromium", | 197 "recipe": "chromium", |
| 208 "remote_run_sync_revision": True, | 198 "remote_run_sync_revision": True, |
| 209 "remote_run_use_gitiles": True, | 199 "remote_run_use_gitiles": True, |
| 210 "use_remote_run": True, | 200 "use_remote_run": True, |
| 211 "scheduler": None, | 201 "scheduler": None, |
| 212 "slave_pools": ["kit_kat_tablet"], | 202 "slave_pools": ["kit_kat_tablet"], |
| 213 "category": "3Testers", | 203 "category": "3Testers", |
| 214 "mergeRequests": True, | 204 "mergeRequests": True, |
| 215 }, | 205 }, |
| 216 "Lollipop Consumer Tester": { | |
| 217 "recipe": "chromium", | |
| 218 "remote_run_sync_revision": True, | |
| 219 "remote_run_use_gitiles": True, | |
| 220 "use_remote_run": True, | |
| 221 "scheduler": None, | |
| 222 "slave_pools": ["lollipop_consumer"], | |
| 223 "category": "3Testers", | |
| 224 "mergeRequests": True, | |
| 225 }, | |
| 226 "Lollipop Low-end Tester": { | |
| 227 "recipe": "chromium", | |
| 228 "remote_run_sync_revision": True, | |
| 229 "remote_run_use_gitiles": True, | |
| 230 "use_remote_run": True, | |
| 231 "scheduler": None, | |
| 232 "slave_pools": ["lollipop_low_end"], | |
| 233 "category": "3Testers", | |
| 234 "mergeRequests": True, | |
| 235 }, | |
| 236 "Lollipop Phone Tester": { | 206 "Lollipop Phone Tester": { |
| 237 "recipe": "chromium", | 207 "recipe": "chromium", |
| 238 "remote_run_sync_revision": True, | 208 "remote_run_sync_revision": True, |
| 239 "remote_run_use_gitiles": True, | 209 "remote_run_use_gitiles": True, |
| 240 "use_remote_run": True, | 210 "use_remote_run": True, |
| 241 "scheduler": None, | 211 "scheduler": None, |
| 242 "slave_pools": ["lollipop_phone"], | 212 "slave_pools": ["lollipop_phone"], |
| 243 "category": "3Testers", | 213 "category": "3Testers", |
| 244 "mergeRequests": True, | 214 "mergeRequests": True, |
| 245 }, | 215 }, |
| 246 "Lollipop Tablet Tester": { | |
| 247 "recipe": "chromium", | |
| 248 "remote_run_sync_revision": True, | |
| 249 "remote_run_use_gitiles": True, | |
| 250 "use_remote_run": True, | |
| 251 "scheduler": None, | |
| 252 "slave_pools": ["lollipop_tablet"], | |
| 253 "category": "3Testers", | |
| 254 "mergeRequests": True, | |
| 255 }, | |
| 256 "Marshmallow 64 bit Tester": { | |
| 257 "recipe": "chromium", | |
| 258 "remote_run_sync_revision": True, | |
| 259 "remote_run_use_gitiles": True, | |
| 260 "use_remote_run": True, | |
| 261 "scheduler": None, | |
| 262 "slave_pools": ["marshmallow_64"], | |
| 263 "category": "3Testers", | |
| 264 "mergeRequests": True, | |
| 265 }, | |
| 266 "Marshmallow Tablet Tester": { | |
| 267 "recipe": "chromium", | |
| 268 "remote_run_sync_revision": True, | |
| 269 "remote_run_use_gitiles": True, | |
| 270 "use_remote_run": True, | |
| 271 "scheduler": None, | |
| 272 "slave_pools": ["marshmallow_tablet"], | |
| 273 "category": "3Testers", | |
| 274 "mergeRequests": True, | |
| 275 }, | |
| 276 }, | 216 }, |
| 277 | 217 |
| 278 "schedulers": { | 218 "schedulers": { |
| 279 "android_commits": { | 219 "android_commits": { |
| 280 "type": "git_poller", | 220 "type": "git_poller", |
| 281 "git_repo_url": "https://chromium.googlesource.com/chromium/src", | 221 "git_repo_url": "https://chromium.googlesource.com/chromium/src", |
| 282 }, | 222 }, |
| 283 }, | 223 }, |
| 284 | 224 |
| 285 "slave_pools": { | 225 "slave_pools": { |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 375 "slaves": ["build87-b1"], | 315 "slaves": ["build87-b1"], |
| 376 }, | 316 }, |
| 377 "cronet_m_bullhead_perf": { | 317 "cronet_m_bullhead_perf": { |
| 378 "slave_data": { | 318 "slave_data": { |
| 379 "os": "linux", | 319 "os": "linux", |
| 380 "version": "trusty", | 320 "version": "trusty", |
| 381 "bits": "64", | 321 "bits": "64", |
| 382 }, | 322 }, |
| 383 "slaves": ["build88-b1"], | 323 "slaves": ["build88-b1"], |
| 384 }, | 324 }, |
| 385 "jelly_bean_tester": { | |
| 386 "slave_data": { | |
| 387 "os": "linux", | |
| 388 "version": "trusty", | |
| 389 "bits": "64", | |
| 390 }, | |
| 391 "slaves": ["build40-b1"], | |
| 392 }, | |
| 393 "kit_kat_tablet": { | 325 "kit_kat_tablet": { |
| 394 "slave_data": { | 326 "slave_data": { |
| 395 "os": "linux", | 327 "os": "linux", |
| 396 "version": "trusty", | 328 "version": "trusty", |
| 397 "bits": "64", | 329 "bits": "64", |
| 398 }, | 330 }, |
| 399 "slaves": ["build42-b1"], | 331 "slaves": ["build42-b1"], |
| 400 }, | 332 }, |
| 401 "lollipop_consumer": { | |
| 402 "slave_data": { | |
| 403 "os": "linux", | |
| 404 "version": "trusty", | |
| 405 "bits": "64", | |
| 406 }, | |
| 407 "slaves": ["build39-b1"], | |
| 408 }, | |
| 409 "lollipop_low_end": { | |
| 410 "slave_data": { | |
| 411 "os": "linux", | |
| 412 "version": "trusty", | |
| 413 "bits": "64", | |
| 414 }, | |
| 415 "slaves": ["build19-b1"], | |
| 416 }, | |
| 417 "lollipop_phone": { | 333 "lollipop_phone": { |
| 418 "slave_data": { | 334 "slave_data": { |
| 419 "os": "linux", | 335 "os": "linux", |
| 420 "version": "trusty", | 336 "version": "trusty", |
| 421 "bits": "64", | 337 "bits": "64", |
| 422 }, | 338 }, |
| 423 "slaves": ["slave145-c1"], | 339 "slaves": ["slave145-c1"], |
| 424 }, | 340 }, |
| 425 "lollipop_tablet": { | |
| 426 "slave_data": { | |
| 427 "os": "linux", | |
| 428 "version": "trusty", | |
| 429 "bits": "64", | |
| 430 }, | |
| 431 "slaves": ["build43-b1"], | |
| 432 }, | |
| 433 "main_n5x_builder": { | 341 "main_n5x_builder": { |
| 434 "slave_data": { | 342 "slave_data": { |
| 435 "os": "linux", | 343 "os": "linux", |
| 436 "version": "trusty", | 344 "version": "trusty", |
| 437 "bits": "64", | 345 "bits": "64", |
| 438 }, | 346 }, |
| 439 "slaves": ["slave76-c1"], | 347 "slaves": ["slave76-c1"], |
| 440 }, | 348 }, |
| 441 "marshmallow_64": { | |
| 442 "slave_data": { | |
| 443 "os": "linux", | |
| 444 "version": "trusty", | |
| 445 "bits": "64", | |
| 446 }, | |
| 447 "slaves": ["slave46-c1"], | |
| 448 }, | |
| 449 "marshmallow_tablet": { | |
| 450 "slave_data": { | |
| 451 "os": "linux", | |
| 452 "version": "trusty", | |
| 453 "bits": "64", | |
| 454 }, | |
| 455 "slaves": ["build44-b1"], | |
| 456 }, | |
| 457 "mips_builder": { | 349 "mips_builder": { |
| 458 "slave_data": { | 350 "slave_data": { |
| 459 "os": "linux", | 351 "os": "linux", |
| 460 "version": "trusty", | 352 "version": "trusty", |
| 461 "bits": 64, | 353 "bits": 64, |
| 462 }, | 354 }, |
| 463 "slaves": [ | 355 "slaves": [ |
| 464 "slave75-c1", | 356 "slave75-c1", |
| 465 ], | 357 ], |
| 466 }, | 358 }, |
| (...skipping 16 matching lines...) Expand all Loading... |
| 483 "webview_m": { | 375 "webview_m": { |
| 484 "slave_data": { | 376 "slave_data": { |
| 485 "os": "linux", | 377 "os": "linux", |
| 486 "version": "trusty", | 378 "version": "trusty", |
| 487 "bits": 64, | 379 "bits": 64, |
| 488 }, | 380 }, |
| 489 "slaves": ["build37-b1"], | 381 "slaves": ["build37-b1"], |
| 490 }, | 382 }, |
| 491 } | 383 } |
| 492 } | 384 } |
| OLD | NEW |