0

Rename mac14-tests-dbg to mac15-tests-dbg

Bug: 416504460, 338402345
Change-Id: Iade8c669bb2acc3ba4a385963916056d4594eccf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6525306
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Reviewed-by: Yue She <yueshe@google.com>
Commit-Queue: Yue She <yueshe@google.com>
Cr-Commit-Position: refs/heads/main@{#1457741}
This commit is contained in:
Rahul Kumar Adudodla
2025-05-08 11:42:16 -07:00
committed by Chromium LUCI CQ
parent 019d7a9f44
commit 9f98c05252
17 changed files with 611 additions and 536 deletions
infra/config

@ -17,8 +17,8 @@ ci/mac12-arm64-rel-tests
ci/mac13-arm64-rel-tests
ci/mac14-arm64-rel-tests
ci/mac14-tests
ci/mac14-tests-dbg
ci/mac15-arm64-rel-tests
ci/mac15-tests-dbg
ci/mac15-x64-rel-tests
try/ios-vm
try/mac-vm

@ -34,7 +34,7 @@
{
"builder_id": {
"bucket": "ci",
"builder": "mac14-tests-dbg",
"builder": "mac15-tests-dbg",
"project": "chromium"
},
"builder_spec": {
@ -73,7 +73,7 @@
"builder_ids_in_scope_for_testing": [
{
"bucket": "ci",
"builder": "mac14-tests-dbg",
"builder": "mac15-tests-dbg",
"project": "chromium"
}
],

@ -4,7 +4,7 @@
"all"
]
},
"mac14-tests-dbg": {
"mac15-tests-dbg": {
"gtest_tests": [
{
"merge": {
@ -14,7 +14,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -29,7 +29,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -44,7 +44,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -60,7 +60,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -75,7 +75,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -90,7 +90,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -105,7 +105,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -120,7 +120,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -143,7 +143,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -158,7 +158,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -173,13 +173,32 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "boringssl_ssl_tests",
"test_id_prefix": "ninja://third_party/boringssl:boringssl_ssl_tests/"
},
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/mac.mac-rel.browser_tests.filter"
],
"merge": {
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "browser_tests",
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 20
},
"test": "browser_tests",
"test_id_prefix": "ninja://chrome/test:browser_tests/"
},
{
"args": [
"--gtest_filter=-*UsingRealWebcam*"
@ -191,7 +210,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -206,7 +225,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -221,7 +240,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -236,7 +255,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -251,7 +270,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -266,7 +285,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -281,7 +300,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 3
@ -297,7 +316,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 18
@ -313,7 +332,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -328,7 +347,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -343,7 +362,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -358,7 +377,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -373,7 +392,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -388,7 +407,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -403,7 +422,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -419,7 +438,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -434,7 +453,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -449,7 +468,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -464,7 +483,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -479,7 +498,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -494,7 +513,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -509,7 +528,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -524,7 +543,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -539,7 +558,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -554,7 +573,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -569,7 +588,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -584,7 +603,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -599,7 +618,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -614,7 +633,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -630,7 +649,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
@ -646,7 +665,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -661,7 +680,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -677,7 +696,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -692,7 +711,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -707,7 +726,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -722,7 +741,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -737,7 +756,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -752,7 +771,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -767,7 +786,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -782,7 +801,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -797,7 +816,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -812,7 +831,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -827,7 +846,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -842,7 +861,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -857,7 +876,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -872,7 +891,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -887,7 +906,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -902,7 +921,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -917,7 +936,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -932,7 +951,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -947,7 +966,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -962,7 +981,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -977,7 +996,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -992,7 +1011,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1007,7 +1026,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 3
@ -1023,7 +1042,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1038,7 +1057,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1053,7 +1072,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1068,7 +1087,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
@ -1084,7 +1103,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1099,7 +1118,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1114,7 +1133,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1129,7 +1148,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1144,7 +1163,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1159,7 +1178,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1174,7 +1193,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1189,7 +1208,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1209,7 +1228,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1236,7 +1255,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 16
@ -1265,7 +1284,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 8
@ -1292,7 +1311,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1311,7 +1330,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1330,7 +1349,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1348,7 +1367,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1380,7 +1399,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 18
@ -1407,7 +1426,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"hard_timeout": 960,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@ -1427,7 +1446,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"idempotent": false,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@ -1450,7 +1469,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"idempotent": false,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@ -1473,7 +1492,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},

@ -31,7 +31,7 @@
{
"builder_id": {
"bucket": "ci",
"builder": "mac14-tests-dbg",
"builder": "mac15-tests-dbg",
"project": "chromium"
},
"builder_spec": {
@ -63,7 +63,7 @@
"builder_ids": [
{
"bucket": "ci",
"builder": "mac14-tests-dbg",
"builder": "mac15-tests-dbg",
"project": "chromium"
}
],
@ -78,7 +78,7 @@
}
],
"retry_failed_shards": true,
"targets_spec_directory": "src/infra/config/generated/builders/ci/mac14-tests-dbg/targets"
"targets_spec_directory": "src/infra/config/generated/builders/ci/mac15-tests-dbg/targets"
}
},
"$recipe_engine/resultdb/test_presentation": {

@ -1,5 +1,5 @@
{
"mac14-tests-dbg": {
"mac15-tests-dbg": {
"gtest_tests": [
{
"merge": {
@ -9,7 +9,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -24,7 +24,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -39,7 +39,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -55,7 +55,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -70,7 +70,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -85,7 +85,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -100,7 +100,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -115,7 +115,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -138,7 +138,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -153,7 +153,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -168,13 +168,32 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "boringssl_ssl_tests",
"test_id_prefix": "ninja://third_party/boringssl:boringssl_ssl_tests/"
},
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/mac.mac-rel.browser_tests.filter"
],
"merge": {
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "browser_tests",
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 20
},
"test": "browser_tests",
"test_id_prefix": "ninja://chrome/test:browser_tests/"
},
{
"args": [
"--gtest_filter=-*UsingRealWebcam*"
@ -186,7 +205,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -201,7 +220,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -216,7 +235,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -231,7 +250,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -246,7 +265,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -261,7 +280,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -276,7 +295,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 3
@ -292,7 +311,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 18
@ -308,7 +327,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -323,7 +342,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -338,7 +357,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -353,7 +372,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -368,7 +387,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -383,7 +402,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -398,7 +417,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -414,7 +433,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -429,7 +448,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -444,7 +463,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -459,7 +478,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -474,7 +493,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -489,7 +508,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -504,7 +523,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -519,7 +538,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -534,7 +553,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -549,7 +568,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -564,7 +583,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -579,7 +598,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -594,7 +613,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -609,7 +628,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -625,7 +644,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
@ -641,7 +660,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -656,7 +675,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -672,7 +691,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -687,7 +706,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -702,7 +721,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -717,7 +736,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -732,7 +751,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -747,7 +766,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -762,7 +781,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -777,7 +796,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -792,7 +811,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -807,7 +826,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -822,7 +841,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -837,7 +856,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -852,7 +871,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -867,7 +886,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -882,7 +901,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -897,7 +916,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -912,7 +931,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -927,7 +946,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -942,7 +961,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -957,7 +976,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -972,7 +991,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -987,7 +1006,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1002,7 +1021,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 3
@ -1018,7 +1037,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1033,7 +1052,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1048,7 +1067,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1063,7 +1082,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
@ -1079,7 +1098,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1094,7 +1113,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1109,7 +1128,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1124,7 +1143,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1139,7 +1158,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1154,7 +1173,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1169,7 +1188,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1184,7 +1203,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1204,7 +1223,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1231,7 +1250,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 16
@ -1260,7 +1279,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 8
@ -1287,7 +1306,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1306,7 +1325,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1325,7 +1344,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1343,7 +1362,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1375,7 +1394,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 18
@ -1402,7 +1421,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"hard_timeout": 960,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@ -1422,7 +1441,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"idempotent": false,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@ -1445,7 +1464,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"idempotent": false,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@ -1468,7 +1487,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},

@ -34,7 +34,7 @@
{
"builder_id": {
"bucket": "ci",
"builder": "mac14-tests-dbg",
"builder": "mac15-tests-dbg",
"project": "chromium"
},
"builder_spec": {
@ -73,7 +73,7 @@
"builder_ids_in_scope_for_testing": [
{
"bucket": "ci",
"builder": "mac14-tests-dbg",
"builder": "mac15-tests-dbg",
"project": "chromium"
}
],

@ -4,7 +4,7 @@
"all"
]
},
"mac14-tests-dbg": {
"mac15-tests-dbg": {
"gtest_tests": [
{
"merge": {
@ -14,7 +14,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -29,7 +29,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -44,7 +44,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -60,7 +60,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -75,7 +75,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -90,7 +90,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -105,7 +105,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -120,7 +120,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -143,7 +143,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -158,7 +158,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -173,13 +173,32 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "boringssl_ssl_tests",
"test_id_prefix": "ninja://third_party/boringssl:boringssl_ssl_tests/"
},
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/mac.mac-rel.browser_tests.filter"
],
"merge": {
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "browser_tests",
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 20
},
"test": "browser_tests",
"test_id_prefix": "ninja://chrome/test:browser_tests/"
},
{
"args": [
"--gtest_filter=-*UsingRealWebcam*"
@ -191,7 +210,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -206,7 +225,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -221,7 +240,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -236,7 +255,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -251,7 +270,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -266,7 +285,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -281,7 +300,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 3
@ -297,7 +316,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 18
@ -313,7 +332,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -328,7 +347,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -343,7 +362,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -358,7 +377,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -373,7 +392,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -388,7 +407,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -403,7 +422,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -419,7 +438,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -434,7 +453,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -449,7 +468,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -464,7 +483,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -479,7 +498,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -494,7 +513,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -509,7 +528,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -524,7 +543,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -539,7 +558,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -554,7 +573,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -569,7 +588,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -584,7 +603,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -599,7 +618,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -614,7 +633,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -630,7 +649,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
@ -646,7 +665,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -661,7 +680,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -677,7 +696,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -692,7 +711,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -707,7 +726,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -722,7 +741,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -737,7 +756,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -752,7 +771,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -767,7 +786,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -782,7 +801,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -797,7 +816,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -812,7 +831,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -827,7 +846,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -842,7 +861,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -857,7 +876,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -872,7 +891,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -887,7 +906,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -902,7 +921,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -917,7 +936,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -932,7 +951,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -947,7 +966,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -962,7 +981,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -977,7 +996,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -992,7 +1011,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1007,7 +1026,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 3
@ -1023,7 +1042,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1038,7 +1057,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1053,7 +1072,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1068,7 +1087,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
@ -1084,7 +1103,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1099,7 +1118,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1114,7 +1133,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1129,7 +1148,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1144,7 +1163,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1159,7 +1178,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1174,7 +1193,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1189,7 +1208,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1209,7 +1228,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1236,7 +1255,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 16
@ -1265,7 +1284,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 8
@ -1292,7 +1311,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1311,7 +1330,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1330,7 +1349,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1348,7 +1367,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1380,7 +1399,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 18
@ -1407,7 +1426,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"hard_timeout": 960,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@ -1427,7 +1446,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"idempotent": false,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@ -1450,7 +1469,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"idempotent": false,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@ -1473,7 +1492,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},

@ -34,7 +34,7 @@
{
"builder_id": {
"bucket": "ci",
"builder": "mac14-tests-dbg",
"builder": "mac15-tests-dbg",
"project": "chromium"
},
"builder_spec": {
@ -73,7 +73,7 @@
"builder_ids_in_scope_for_testing": [
{
"bucket": "ci",
"builder": "mac14-tests-dbg",
"builder": "mac15-tests-dbg",
"project": "chromium"
}
],

@ -4,7 +4,7 @@
"all"
]
},
"mac14-tests-dbg": {
"mac15-tests-dbg": {
"gtest_tests": [
{
"merge": {
@ -14,7 +14,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -29,7 +29,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -44,7 +44,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -60,7 +60,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -75,7 +75,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -90,7 +90,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -105,7 +105,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -120,7 +120,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -143,7 +143,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -158,7 +158,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -173,13 +173,32 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "boringssl_ssl_tests",
"test_id_prefix": "ninja://third_party/boringssl:boringssl_ssl_tests/"
},
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/mac.mac-rel.browser_tests.filter"
],
"merge": {
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "browser_tests",
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 20
},
"test": "browser_tests",
"test_id_prefix": "ninja://chrome/test:browser_tests/"
},
{
"args": [
"--gtest_filter=-*UsingRealWebcam*"
@ -191,7 +210,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -206,7 +225,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -221,7 +240,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -236,7 +255,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -251,7 +270,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -266,7 +285,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -281,7 +300,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 3
@ -297,7 +316,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 18
@ -313,7 +332,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -328,7 +347,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -343,7 +362,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -358,7 +377,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -373,7 +392,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -388,7 +407,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -403,7 +422,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -419,7 +438,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -434,7 +453,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -449,7 +468,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -464,7 +483,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -479,7 +498,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -494,7 +513,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -509,7 +528,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -524,7 +543,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -539,7 +558,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -554,7 +573,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -569,7 +588,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -584,7 +603,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -599,7 +618,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -614,7 +633,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -630,7 +649,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
@ -646,7 +665,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -661,7 +680,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -677,7 +696,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -692,7 +711,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -707,7 +726,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -722,7 +741,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -737,7 +756,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -752,7 +771,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -767,7 +786,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -782,7 +801,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -797,7 +816,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -812,7 +831,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -827,7 +846,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -842,7 +861,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -857,7 +876,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -872,7 +891,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -887,7 +906,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -902,7 +921,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -917,7 +936,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -932,7 +951,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -947,7 +966,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -962,7 +981,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -977,7 +996,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -992,7 +1011,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1007,7 +1026,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 3
@ -1023,7 +1042,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1038,7 +1057,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1053,7 +1072,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1068,7 +1087,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
@ -1084,7 +1103,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1099,7 +1118,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1114,7 +1133,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1129,7 +1148,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1144,7 +1163,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1159,7 +1178,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1174,7 +1193,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1189,7 +1208,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1209,7 +1228,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1236,7 +1255,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 16
@ -1265,7 +1284,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 8
@ -1292,7 +1311,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1311,7 +1330,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1330,7 +1349,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1348,7 +1367,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
@ -1380,7 +1399,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 18
@ -1407,7 +1426,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"hard_timeout": 960,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@ -1427,7 +1446,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"idempotent": false,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@ -1450,7 +1469,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"idempotent": false,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@ -1473,7 +1492,7 @@
"swarming": {
"dimensions": {
"cpu": "x86-64",
"os": "Mac-14|Mac-15"
"os": "Mac-15"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},

@ -12062,27 +12062,6 @@
}
]
},
"mac14-tests-dbg": {
"contact_team_email": "bling-engprod@google.com",
"problem_specs": [
{
"name": "Unhealthy",
"period_days": 7,
"score": 5,
"thresholds": {
"_default": "_default"
}
},
{
"name": "Low Value",
"period_days": 90,
"score": 1,
"thresholds": {
"_default": "_default"
}
}
]
},
"mac14-x64-updater-tester-rel": {
"contact_team_email": "omaha@google.com",
"problem_specs": [
@ -12167,6 +12146,27 @@
}
]
},
"mac15-tests-dbg": {
"contact_team_email": "bling-engprod@google.com",
"problem_specs": [
{
"name": "Unhealthy",
"period_days": 7,
"score": 5,
"thresholds": {
"_default": "_default"
}
},
{
"name": "Low Value",
"period_days": 90,
"score": 1,
"thresholds": {
"_default": "_default"
}
}
]
},
"mac15-x64-rel-tests": {
"contact_team_email": "bling-engprod@google.com",
"problem_specs": [

@ -67484,116 +67484,6 @@ buckets {
predicates: "string(build.output.properties.is_cached) == \"false\""
}
}
builders {
name: "mac14-tests-dbg"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "free_space:standard"
dimensions: "os:Ubuntu-22.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/chromium/bootstrapper/${platform}"
cipd_version: "latest"
cmd: "bootstrapper"
}
properties:
'{'
' "$bootstrap/exe": {'
' "exe": {'
' "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
' "cipd_version": "refs/heads/main",'
' "cmd": ['
' "luciexe"'
' ]'
' }'
' },'
' "$bootstrap/properties": {'
' "properties_file": "infra/config/generated/builders/ci/mac14-tests-dbg/properties.json",'
' "top_level_project": {'
' "ref": "refs/heads/main",'
' "repo": {'
' "host": "chromium.googlesource.com",'
' "project": "chromium/src"'
' }'
' }'
' },'
' "builder_group": "chromium.mac",'
' "led_builder_is_bootstrapped": true,'
' "recipe": "chromium"'
'}'
execution_timeout_secs: 10800
build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.use_per_builder_build_dir_name"
value: 100
}
experiments {
key: "luci.recipes.use_python3"
value: 100
}
resultdb {
enable: true
bq_exports {
project: "chrome-luci-data"
dataset: "chromium"
table: "ci_test_results"
test_results {}
}
bq_exports {
project: "chrome-luci-data"
dataset: "chromium"
table: "gpu_ci_test_results"
test_results {
predicate {
test_id_regexp: "ninja://(chrome|content)/test:telemetry_gpu_integration_test[^/]*/.+"
}
}
}
bq_exports {
project: "chrome-luci-data"
dataset: "chromium"
table: "blink_web_tests_ci_test_results"
test_results {
predicate {
test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*_wpt_tests/.+)|(ninja://[^/]*headless_shell_wpt/.+)"
}
}
}
history_options {
use_invocation_timestamp: true
}
}
description_html: "Runs Mac 14 tests with debug config.<br/>This builder is mirrored by any of the following try builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/chromium/builders/try/mac_chromium_compile_dbg_ng\">mac_chromium_compile_dbg_ng</a></li><li><a href=\"https://ci.chromium.org/p/chromium/builders/try/mac_chromium_dbg_ng\">mac_chromium_dbg_ng</a></li></ul><br/>Builder owner: <a href=mailto:bling-engprod@google.com>bling-engprod@google.com</a>"
shadow_builder_adjustments {
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
pool: "luci.chromium.try"
dimensions: "free_space:"
dimensions: "pool:luci.chromium.try"
}
contact_team_email: "bling-engprod@google.com"
custom_metric_definitions {
name: "/chrome/infra/browser/builds/cached_count"
predicates: "has(build.output.properties.is_cached)"
predicates: "string(build.output.properties.is_cached) == \"true\""
}
custom_metric_definitions {
name: "/chrome/infra/browser/builds/ran_tests_retry_shard_count"
predicates: "has(build.output.properties.ran_tests_retry_shard)"
}
custom_metric_definitions {
name: "/chrome/infra/browser/builds/ran_tests_without_patch_count"
predicates: "has(build.output.properties.ran_tests_without_patch)"
}
custom_metric_definitions {
name: "/chrome/infra/browser/builds/uncached_count"
predicates: "has(build.output.properties.is_cached)"
predicates: "string(build.output.properties.is_cached) == \"false\""
}
}
builders {
name: "mac14-x64-updater-tester-rel"
swarming_host: "chromium-swarm.appspot.com"
@ -68034,6 +67924,116 @@ buckets {
predicates: "string(build.output.properties.is_cached) == \"false\""
}
}
builders {
name: "mac15-tests-dbg"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "free_space:standard"
dimensions: "os:Ubuntu-22.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/chromium/bootstrapper/${platform}"
cipd_version: "latest"
cmd: "bootstrapper"
}
properties:
'{'
' "$bootstrap/exe": {'
' "exe": {'
' "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
' "cipd_version": "refs/heads/main",'
' "cmd": ['
' "luciexe"'
' ]'
' }'
' },'
' "$bootstrap/properties": {'
' "properties_file": "infra/config/generated/builders/ci/mac15-tests-dbg/properties.json",'
' "top_level_project": {'
' "ref": "refs/heads/main",'
' "repo": {'
' "host": "chromium.googlesource.com",'
' "project": "chromium/src"'
' }'
' }'
' },'
' "builder_group": "chromium.mac",'
' "led_builder_is_bootstrapped": true,'
' "recipe": "chromium"'
'}'
execution_timeout_secs: 10800
build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.use_per_builder_build_dir_name"
value: 100
}
experiments {
key: "luci.recipes.use_python3"
value: 100
}
resultdb {
enable: true
bq_exports {
project: "chrome-luci-data"
dataset: "chromium"
table: "ci_test_results"
test_results {}
}
bq_exports {
project: "chrome-luci-data"
dataset: "chromium"
table: "gpu_ci_test_results"
test_results {
predicate {
test_id_regexp: "ninja://(chrome|content)/test:telemetry_gpu_integration_test[^/]*/.+"
}
}
}
bq_exports {
project: "chrome-luci-data"
dataset: "chromium"
table: "blink_web_tests_ci_test_results"
test_results {
predicate {
test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*_wpt_tests/.+)|(ninja://[^/]*headless_shell_wpt/.+)"
}
}
}
history_options {
use_invocation_timestamp: true
}
}
description_html: "Runs Mac 15 tests with debug config.<br/>This builder is mirrored by any of the following try builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/chromium/builders/try/mac_chromium_compile_dbg_ng\">mac_chromium_compile_dbg_ng</a></li><li><a href=\"https://ci.chromium.org/p/chromium/builders/try/mac_chromium_dbg_ng\">mac_chromium_dbg_ng</a></li></ul><br/>Builder owner: <a href=mailto:bling-engprod@google.com>bling-engprod@google.com</a>"
shadow_builder_adjustments {
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
pool: "luci.chromium.try"
dimensions: "free_space:"
dimensions: "pool:luci.chromium.try"
}
contact_team_email: "bling-engprod@google.com"
custom_metric_definitions {
name: "/chrome/infra/browser/builds/cached_count"
predicates: "has(build.output.properties.is_cached)"
predicates: "string(build.output.properties.is_cached) == \"true\""
}
custom_metric_definitions {
name: "/chrome/infra/browser/builds/ran_tests_retry_shard_count"
predicates: "has(build.output.properties.ran_tests_retry_shard)"
}
custom_metric_definitions {
name: "/chrome/infra/browser/builds/ran_tests_without_patch_count"
predicates: "has(build.output.properties.ran_tests_without_patch)"
}
custom_metric_definitions {
name: "/chrome/infra/browser/builds/uncached_count"
predicates: "has(build.output.properties.is_cached)"
predicates: "string(build.output.properties.is_cached) == \"false\""
}
}
builders {
name: "mac15-x64-rel-tests"
swarming_host: "chromium-swarm.appspot.com"
@ -126308,7 +126308,7 @@ buckets {
use_invocation_timestamp: true
}
}
description_html: "This builder mirrors the following CI builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/chromium/builders/ci/Mac Builder (dbg)\">Mac Builder (dbg)</a></li><li><a href=\"https://ci.chromium.org/p/chromium/builders/ci/mac14-tests-dbg\">mac14-tests-dbg</a></li></ul>"
description_html: "This builder mirrors the following CI builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/chromium/builders/ci/Mac Builder (dbg)\">Mac Builder (dbg)</a></li><li><a href=\"https://ci.chromium.org/p/chromium/builders/ci/mac15-tests-dbg\">mac15-tests-dbg</a></li></ul>"
custom_metric_definitions {
name: "/chrome/infra/browser/builds/cached_count"
predicates: "has(build.output.properties.is_cached)"

@ -687,9 +687,9 @@ consoles {
short_name: "bld"
}
builders {
name: "buildbucket/luci.chromium.ci/mac14-tests-dbg"
name: "buildbucket/luci.chromium.ci/mac15-tests-dbg"
category: "chromium.mac|debug"
short_name: "14"
short_name: "15"
}
builders {
name: "buildbucket/luci.chromium.ci/mac-arm64-dbg"
@ -1453,9 +1453,9 @@ consoles {
short_name: "bld"
}
builders {
name: "buildbucket/luci.chromium.ci/mac14-tests-dbg"
name: "buildbucket/luci.chromium.ci/mac15-tests-dbg"
category: "chromium.mac|debug"
short_name: "14"
short_name: "15"
}
builders {
name: "buildbucket/luci.chromium.ci/ios-simulator"
@ -19016,9 +19016,9 @@ consoles {
short_name: "bld"
}
builders {
name: "buildbucket/luci.chromium.ci/mac14-tests-dbg"
name: "buildbucket/luci.chromium.ci/mac15-tests-dbg"
category: "debug"
short_name: "14"
short_name: "15"
}
builders {
name: "buildbucket/luci.chromium.ci/mac-arm64-dbg"

@ -3914,7 +3914,7 @@ notifiers {
}
builders {
bucket: "ci"
name: "mac14-tests-dbg"
name: "mac15-tests-dbg"
}
tree_closers {
tree_status_host: "chromium-status.appspot.com"

@ -5952,15 +5952,6 @@ job {
builder: "mac14-tests"
}
}
job {
id: "mac14-tests-dbg"
realm: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "ci"
builder: "mac14-tests-dbg"
}
}
job {
id: "mac14-x64-updater-tester-rel"
realm: "ci"
@ -5997,6 +5988,15 @@ job {
builder: "mac15-arm64-updater-tester-rel"
}
}
job {
id: "mac15-tests-dbg"
realm: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "ci"
builder: "mac15-tests-dbg"
}
}
job {
id: "mac15-x64-rel-tests"
realm: "ci"

@ -293,11 +293,11 @@ realms {
values: "mac14-arm64-rel-tests"
values: "mac14-arm64-updater-tester-dbg"
values: "mac14-tests"
values: "mac14-tests-dbg"
values: "mac14-x64-updater-tester-rel"
values: "mac15-arm64-rel-tests"
values: "mac15-arm64-updater-tester-dbg"
values: "mac15-arm64-updater-tester-rel"
values: "mac15-tests-dbg"
values: "mac15-x64-rel-tests"
values: "win10-32-on-64-enterprise-companion-tester-dbg"
values: "win10-32-on-64-enterprise-companion-tester-rel"

@ -916,9 +916,9 @@ ci.thin_tester(
)
ci.thin_tester(
name = "mac14-tests-dbg",
name = "mac15-tests-dbg",
branch_selector = branches.selector.MAC_BRANCHES,
description_html = "Runs Mac 14 tests with debug config.",
description_html = "Runs Mac 15 tests with debug config.",
triggered_by = ["ci/Mac Builder (dbg)"],
builder_spec = builder_config.builder_spec(
execution_mode = builder_config.execution_mode.TEST,
@ -943,7 +943,7 @@ ci.thin_tester(
"chromium_dbg_isolated_scripts",
],
mixins = [
"mac_14_x64",
"mac_15_x64",
],
per_test_modifications = {
"blink_web_tests": targets.mixin(
@ -959,15 +959,14 @@ ci.thin_tester(
shards = 8,
),
),
"browser_tests": targets.remove(
reason = "TODO(crbug.com/338402345): Enable if there is enough capacity after Mac 14 upgrades.",
"browser_tests": targets.mixin(
args = [
"--test-launcher-filter-file=../../testing/buildbot/filters/mac.mac-rel.browser_tests.filter",
],
swarming = targets.swarming(
shards = 20,
),
),
# "browser_tests": targets.mixin(
# # crbug.com/1196416
# args = [
# "--test-launcher-filter-file=../../testing/buildbot/filters/mac.mac-rel.browser_tests.filter",
# ],
# ),
"content_browsertests": targets.mixin(
# https://crbug.com/1279504
swarming = targets.swarming(
@ -1005,7 +1004,7 @@ ci.thin_tester(
gardener_rotations = args.ignore_default(None),
console_view_entry = consoles.console_view_entry(
category = "debug",
short_name = "14",
short_name = "15",
),
cq_mirrors_console_view = "mirrors",
contact_team_email = "bling-engprod@google.com",

@ -553,7 +553,7 @@ try_.builder(
name = "mac_chromium_dbg_ng",
mirrors = [
"ci/Mac Builder (dbg)",
"ci/mac14-tests-dbg",
"ci/mac15-tests-dbg",
],
gn_args = "ci/Mac Builder (dbg)",
cpu = cpu.ARM64,