| 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 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 279 "android_commits": { | 279 "android_commits": { |
| 280 "type": "git_poller", | 280 "type": "git_poller", |
| 281 "git_repo_url": "https://chromium.googlesource.com/chromium/src", | 281 "git_repo_url": "https://chromium.googlesource.com/chromium/src", |
| 282 }, | 282 }, |
| 283 }, | 283 }, |
| 284 | 284 |
| 285 "slave_pools": { | 285 "slave_pools": { |
| 286 "arm_builder": { | 286 "arm_builder": { |
| 287 "slave_data": { | 287 "slave_data": { |
| 288 "os": "linux", | 288 "os": "linux", |
| 289 "version": "precise", | 289 "version": "trusty", |
| 290 "bits": 64, | 290 "bits": 64, |
| 291 }, | 291 }, |
| 292 "slaves": [ | 292 "slaves": [ |
| 293 "slave35-c1", | 293 "slave35-c1", |
| 294 ], | 294 ], |
| 295 }, | 295 }, |
| 296 "builders": { | 296 "builders": { |
| 297 "slave_data": { | 297 "slave_data": { |
| 298 "os": "linux", | 298 "os": "linux", |
| 299 "version": "trusty", | 299 "version": "trusty", |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 "slave_data": { | 346 "slave_data": { |
| 347 "os": "linux", | 347 "os": "linux", |
| 348 "version": "precise", | 348 "version": "precise", |
| 349 "bits": 64, | 349 "bits": 64, |
| 350 }, | 350 }, |
| 351 "slaves": ["vm990-m1"], | 351 "slaves": ["vm990-m1"], |
| 352 }, | 352 }, |
| 353 "cronet_k_hammerhead": { | 353 "cronet_k_hammerhead": { |
| 354 "slave_data": { | 354 "slave_data": { |
| 355 "os": "linux", | 355 "os": "linux", |
| 356 "version": "precise", | 356 "version": "trusty", |
| 357 "bits": "64", | 357 "bits": "64", |
| 358 }, | 358 }, |
| 359 "slaves": ["build69-b1"], | 359 "slaves": ["build69-b1"], |
| 360 }, | 360 }, |
| 361 "cronet_l_hammerhead": { | 361 "cronet_l_hammerhead": { |
| 362 "slave_data": { | 362 "slave_data": { |
| 363 "os": "linux", | 363 "os": "linux", |
| 364 "version": "precise", | 364 "version": "trusty", |
| 365 "bits": "64", | 365 "bits": "64", |
| 366 }, | 366 }, |
| 367 "slaves": ["build86-b1"], | 367 "slaves": ["build86-b1"], |
| 368 }, | 368 }, |
| 369 "cronet_m_bullhead": { | 369 "cronet_m_bullhead": { |
| 370 "slave_data": { | 370 "slave_data": { |
| 371 "os": "linux", | 371 "os": "linux", |
| 372 "version": "precise", | 372 "version": "trusty", |
| 373 "bits": "64", | 373 "bits": "64", |
| 374 }, | 374 }, |
| 375 "slaves": ["build87-b1"], | 375 "slaves": ["build87-b1"], |
| 376 }, | 376 }, |
| 377 "cronet_m_bullhead_perf": { | 377 "cronet_m_bullhead_perf": { |
| 378 "slave_data": { | 378 "slave_data": { |
| 379 "os": "linux", | 379 "os": "linux", |
| 380 "version": "precise", | 380 "version": "trusty", |
| 381 "bits": "64", | 381 "bits": "64", |
| 382 }, | 382 }, |
| 383 "slaves": ["build88-b1"], | 383 "slaves": ["build88-b1"], |
| 384 }, | 384 }, |
| 385 "jelly_bean_tester": { | 385 "jelly_bean_tester": { |
| 386 "slave_data": { | 386 "slave_data": { |
| 387 "os": "linux", | 387 "os": "linux", |
| 388 "version": "precise", | 388 "version": "trusty", |
| 389 "bits": "64", | 389 "bits": "64", |
| 390 }, | 390 }, |
| 391 "slaves": ["build40-b1"], | 391 "slaves": ["build40-b1"], |
| 392 }, | 392 }, |
| 393 "kit_kat_tablet": { | 393 "kit_kat_tablet": { |
| 394 "slave_data": { | 394 "slave_data": { |
| 395 "os": "linux", | 395 "os": "linux", |
| 396 "version": "precise", | 396 "version": "trusty", |
| 397 "bits": "64", | 397 "bits": "64", |
| 398 }, | 398 }, |
| 399 "slaves": ["build42-b1"], | 399 "slaves": ["build42-b1"], |
| 400 }, | 400 }, |
| 401 "lollipop_consumer": { | 401 "lollipop_consumer": { |
| 402 "slave_data": { | 402 "slave_data": { |
| 403 "os": "linux", | 403 "os": "linux", |
| 404 "version": "precise", | 404 "version": "trusty", |
| 405 "bits": "64", | 405 "bits": "64", |
| 406 }, | 406 }, |
| 407 "slaves": ["build39-b1"], | 407 "slaves": ["build39-b1"], |
| 408 }, | 408 }, |
| 409 "lollipop_low_end": { | 409 "lollipop_low_end": { |
| 410 "slave_data": { | 410 "slave_data": { |
| 411 "os": "linux", | 411 "os": "linux", |
| 412 "version": "precise", | 412 "version": "trusty", |
| 413 "bits": "64", | 413 "bits": "64", |
| 414 }, | 414 }, |
| 415 "slaves": ["build19-b1"], | 415 "slaves": ["build19-b1"], |
| 416 }, | 416 }, |
| 417 "lollipop_phone": { | 417 "lollipop_phone": { |
| 418 "slave_data": { | 418 "slave_data": { |
| 419 "os": "linux", | 419 "os": "linux", |
| 420 "version": "precise", | 420 "version": "trusty", |
| 421 "bits": "64", | 421 "bits": "64", |
| 422 }, | 422 }, |
| 423 "slaves": ["build41-b1"], | 423 "slaves": ["build41-b1"], |
| 424 }, | 424 }, |
| 425 "lollipop_tablet": { | 425 "lollipop_tablet": { |
| 426 "slave_data": { | 426 "slave_data": { |
| 427 "os": "linux", | 427 "os": "linux", |
| 428 "version": "precise", | 428 "version": "trusty", |
| 429 "bits": "64", | 429 "bits": "64", |
| 430 }, | 430 }, |
| 431 "slaves": ["build43-b1"], | 431 "slaves": ["build43-b1"], |
| 432 }, | 432 }, |
| 433 "main_n5x_builder": { | 433 "main_n5x_builder": { |
| 434 "slave_data": { | 434 "slave_data": { |
| 435 "os": "linux", | 435 "os": "linux", |
| 436 "version": "trusty", | 436 "version": "trusty", |
| 437 "bits": "64", | 437 "bits": "64", |
| 438 }, | 438 }, |
| 439 "slaves": ["slave76-c1"], | 439 "slaves": ["slave76-c1"], |
| 440 }, | 440 }, |
| 441 "marshmallow_64": { | 441 "marshmallow_64": { |
| 442 "slave_data": { | 442 "slave_data": { |
| 443 "os": "linux", | 443 "os": "linux", |
| 444 "version": "trusty", | 444 "version": "trusty", |
| 445 "bits": "64", | 445 "bits": "64", |
| 446 }, | 446 }, |
| 447 "slaves": ["slave46-c1"], | 447 "slaves": ["slave46-c1"], |
| 448 }, | 448 }, |
| 449 "marshmallow_tablet": { | 449 "marshmallow_tablet": { |
| 450 "slave_data": { | 450 "slave_data": { |
| 451 "os": "linux", | 451 "os": "linux", |
| 452 "version": "precise", | 452 "version": "trusty", |
| 453 "bits": "64", | 453 "bits": "64", |
| 454 }, | 454 }, |
| 455 "slaves": ["build44-b1"], | 455 "slaves": ["build44-b1"], |
| 456 }, | 456 }, |
| 457 "mips_builder": { | 457 "mips_builder": { |
| 458 "slave_data": { | 458 "slave_data": { |
| 459 "os": "linux", | 459 "os": "linux", |
| 460 "version": "trusty", | 460 "version": "trusty", |
| 461 "bits": 64, | 461 "bits": 64, |
| 462 }, | 462 }, |
| 463 "slaves": [ | 463 "slaves": [ |
| 464 "slave75-c1", | 464 "slave75-c1", |
| 465 ], | 465 ], |
| 466 }, | 466 }, |
| 467 "webview_cts": { | 467 "webview_cts": { |
| 468 "slave_data": { | 468 "slave_data": { |
| 469 "os": "linux", | 469 "os": "linux", |
| 470 "version": "precise", | 470 "version": "trusty", |
| 471 "bits": 64, | 471 "bits": 64, |
| 472 }, | 472 }, |
| 473 "slaves": ["build68-b1"], | 473 "slaves": ["build68-b1"], |
| 474 }, | 474 }, |
| 475 "webview_l": { | 475 "webview_l": { |
| 476 "slave_data": { | 476 "slave_data": { |
| 477 "os": "linux", | 477 "os": "linux", |
| 478 "version": "precise", | 478 "version": "trusty", |
| 479 "bits": 64, | 479 "bits": 64, |
| 480 }, | 480 }, |
| 481 "slaves": ["build62-b1"], | 481 "slaves": ["build62-b1"], |
| 482 }, | 482 }, |
| 483 "webview_m": { | 483 "webview_m": { |
| 484 "slave_data": { | 484 "slave_data": { |
| 485 "os": "linux", | 485 "os": "linux", |
| 486 "version": "trusty", | 486 "version": "trusty", |
| 487 "bits": 64, | 487 "bits": 64, |
| 488 }, | 488 }, |
| 489 "slaves": ["build37-b1"], | 489 "slaves": ["build37-b1"], |
| 490 }, | 490 }, |
| 491 } | 491 } |
| 492 } | 492 } |
| OLD | NEW |