4664:Change the target for Mac10.15-Tests and mac-rel to 10.15 or Mac11
#BotUpQ42021
Bug:1270515
(cherry picked from commit a28a219a3444f4e7c4cb394af5e91e686a3e6a51)
Change-Id: Ia0963409b5735dc26d8d4c04f99cc84fe518f7b1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3279624
Commit-Queue: Lindsay Pasricha <lindsayw@chromium.org>
Reviewed-by: Erik Staab <estaab@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#942155}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3285265
Cr-Commit-Position: refs/branch-heads/4664@{#1086}
Cr-Branched-From: 24dc4ee75e01a29d390d43c9c264372a169273a7-refs/heads/main@{#929512}
diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
index 99c4226..146ff84 100644
--- a/testing/buildbot/chromium.mac.json
+++ b/testing/buildbot/chromium.mac.json
@@ -7091,7 +7091,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7110,7 +7110,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7132,7 +7132,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7152,7 +7152,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7171,7 +7171,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7190,7 +7190,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7209,7 +7209,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7228,7 +7228,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7247,7 +7247,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7267,7 +7267,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7286,7 +7286,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7305,7 +7305,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7327,7 +7327,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7346,7 +7346,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7365,7 +7365,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7384,7 +7384,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7403,7 +7403,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7422,7 +7422,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7441,7 +7441,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7460,7 +7460,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -7480,7 +7480,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7499,7 +7499,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7518,7 +7518,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7537,7 +7537,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7556,7 +7556,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7575,7 +7575,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7594,7 +7594,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7613,7 +7613,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7632,7 +7632,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7651,7 +7651,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7670,7 +7670,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7689,7 +7689,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7708,7 +7708,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7727,7 +7727,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7746,7 +7746,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7765,7 +7765,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7784,7 +7784,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7803,7 +7803,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7822,7 +7822,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7841,7 +7841,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7860,7 +7860,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -7880,7 +7880,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7899,7 +7899,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7918,7 +7918,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7937,7 +7937,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7956,7 +7956,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7975,7 +7975,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -7994,7 +7994,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8013,7 +8013,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8032,7 +8032,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8051,7 +8051,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8070,7 +8070,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8089,7 +8089,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8108,7 +8108,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8127,7 +8127,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8146,7 +8146,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8165,7 +8165,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8184,7 +8184,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8203,7 +8203,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8222,7 +8222,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8241,7 +8241,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8260,7 +8260,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8279,7 +8279,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8298,7 +8298,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8317,7 +8317,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8336,7 +8336,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8355,7 +8355,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8377,7 +8377,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8396,7 +8396,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8415,7 +8415,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8434,7 +8434,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8458,7 +8458,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8477,7 +8477,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8496,7 +8496,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8515,7 +8515,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8534,7 +8534,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8554,7 +8554,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8573,7 +8573,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8599,7 +8599,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8628,7 +8628,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -8655,7 +8655,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8675,7 +8675,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8700,7 +8700,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8724,7 +8724,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8748,7 +8748,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8771,7 +8771,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8791,7 +8791,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8814,7 +8814,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8837,7 +8837,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"idempotent": false,
@@ -8865,7 +8865,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"idempotent": false,
@@ -8892,7 +8892,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
- "os": "Mac-10.15"
+ "os": "Mac-10.15|Mac-11|Mac-10.16"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
diff --git a/testing/buildbot/mixins.pyl b/testing/buildbot/mixins.pyl
index 963f3fe9..55e27f9 100644
--- a/testing/buildbot/mixins.pyl
+++ b/testing/buildbot/mixins.pyl
@@ -683,6 +683,15 @@
},
},
},
+ # TODO(crbug.com/1254953) Remove 10.15 once testers have been migrated to Mac11
+ 'mac_10.15_or_11': {
+ 'swarming': {
+ 'dimensions': {
+ 'cpu': 'x86-64',
+ 'os': 'Mac-10.15|Mac-11|Mac-10.16',
+ },
+ },
+ },
'mac_11_arm64': {
'swarming': {
'dimensions': {
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index 8796cc4..f18a141 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -5275,7 +5275,7 @@
'Mac10.15 Tests': {
'mixins': [
'isolate_profile_data',
- 'mac_10.15',
+ 'mac_10.15_or_11',
],
'test_suites': {
'gtest_tests': 'chromium_mac_gtests_no_nacl',