[infra] Change 'Mac10.13 Tests' tester os dimension to Mac 10.13 or 10.15
In preparation to upgrade Mac CQ builder(mac-rel)'s tester machines to
solely Mac 10.15.
(cherry picked from commit b00682d8e76d5810e727086fb59a0ef41fe76675)
No-try: True
Bug: 1171053
Change-Id: I7e3761ef1703f5cdd752a7f23eff467b5a57da99
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2651865
Commit-Queue: Zhaoyang Li <zhaoyangli@chromium.org>
Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#849202}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2670238
Auto-Submit: Zhaoyang Li <zhaoyangli@chromium.org>
Cr-Commit-Position: refs/branch-heads/4324@{#2102}
Cr-Branched-From: c73b5a651d37a6c4d0b8e3262cc4015a5579c6c8-refs/heads/master@{#827102}
diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
index 176ee4a..6cb9a57f 100644
--- a/testing/buildbot/chromium.mac.json
+++ b/testing/buildbot/chromium.mac.json
@@ -3628,8 +3628,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3647,8 +3646,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3669,8 +3667,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3689,8 +3686,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3708,8 +3704,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3727,8 +3722,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3746,8 +3740,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3765,8 +3758,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3784,8 +3776,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3803,8 +3794,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3823,8 +3813,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3842,8 +3831,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3861,8 +3849,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3883,8 +3870,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3902,8 +3888,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3921,8 +3906,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3940,8 +3924,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3959,8 +3942,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3978,8 +3960,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3997,8 +3978,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4016,8 +3996,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -4036,8 +4015,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4055,8 +4033,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4074,8 +4051,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4093,8 +4069,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4112,8 +4087,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4131,8 +4105,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4150,8 +4123,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4169,8 +4141,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4188,8 +4159,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4207,8 +4177,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4226,8 +4195,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4245,8 +4213,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4264,8 +4231,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4283,8 +4249,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4302,8 +4267,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4321,8 +4285,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4340,8 +4303,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4359,8 +4321,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4378,8 +4339,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4397,8 +4357,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4416,8 +4375,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -4436,8 +4394,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4455,8 +4412,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4474,8 +4430,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4493,8 +4448,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4512,8 +4466,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4531,8 +4484,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4550,8 +4502,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4569,8 +4520,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4588,8 +4538,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4607,8 +4556,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4626,8 +4574,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4645,8 +4592,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4664,8 +4610,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4683,8 +4628,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4702,8 +4646,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4721,8 +4664,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4740,8 +4682,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4759,8 +4700,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4778,8 +4718,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4797,8 +4736,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4816,8 +4754,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4835,8 +4772,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4854,8 +4790,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4873,8 +4808,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4892,8 +4826,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4911,8 +4844,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4933,8 +4865,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4952,8 +4883,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4971,8 +4901,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4990,8 +4919,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5009,8 +4937,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5028,8 +4955,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5047,8 +4973,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5066,8 +4991,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5085,8 +5009,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5105,8 +5028,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5124,8 +5046,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5150,8 +5071,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5179,7 +5099,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -5202,8 +5122,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5222,8 +5141,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5247,8 +5165,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5271,8 +5188,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5294,8 +5210,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5318,8 +5233,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5341,8 +5255,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5361,8 +5274,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5384,8 +5296,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5407,8 +5318,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5430,8 +5340,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"idempotent": false,
@@ -5458,8 +5367,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"idempotent": false,
@@ -5480,8 +5388,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -5505,8 +5412,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
- "gpu": "none",
- "os": "Mac-10.13.6"
+ "os": "Mac-10.13.6|Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
diff --git a/testing/buildbot/mixins.pyl b/testing/buildbot/mixins.pyl
index c1391d979..56426b4 100644
--- a/testing/buildbot/mixins.pyl
+++ b/testing/buildbot/mixins.pyl
@@ -535,6 +535,13 @@
},
},
},
+ 'mac_10.13_or_10.15': {
+ 'swarming': {
+ 'dimensions': {
+ 'os': 'Mac-10.13.6|Mac-10.15',
+ },
+ },
+ },
'mac_10.14': {
'swarming': {
'dimensions': {
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index 438d4c82..d5cc983 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -4738,8 +4738,7 @@
'Mac10.13 Tests': {
'mixins': [
'isolate_profile_data',
- 'mac_10.13',
- 'no_gpu',
+ 'mac_10.13_or_10.15',
],
'test_suites': {
'gtest_tests': 'chromium_mac_gtests_no_nacl',