Commit f1449cab authored by adoneria's avatar adoneria Committed by Chromium LUCI CQ

update mixins for macOS arm64 machines.

Use Mac-11.0 only. Remove Mac-10.16 swarming dimension which does not
exist anymore.

Bug: 1156252
Change-Id: Ie8e146cfa6f7e3d6e78756d34e1d661e7b1c8564
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2577759Reviewed-by: default avatarGarrett Beaty <gbeaty@chromium.org>
Commit-Queue: Anjali Doneria <adoneria@google.com>
Cr-Commit-Position: refs/heads/master@{#834372}
parent a8637e9b
This diff is collapsed.
...@@ -23499,7 +23499,7 @@ ...@@ -23499,7 +23499,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -23524,7 +23524,7 @@ ...@@ -23524,7 +23524,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -23552,7 +23552,7 @@ ...@@ -23552,7 +23552,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -23578,7 +23578,7 @@ ...@@ -23578,7 +23578,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -23603,7 +23603,7 @@ ...@@ -23603,7 +23603,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -23626,7 +23626,7 @@ ...@@ -23626,7 +23626,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -23649,7 +23649,7 @@ ...@@ -23649,7 +23649,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -23669,7 +23669,7 @@ ...@@ -23669,7 +23669,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -23693,7 +23693,7 @@ ...@@ -23693,7 +23693,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -23713,7 +23713,7 @@ ...@@ -23713,7 +23713,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -23749,7 +23749,7 @@ ...@@ -23749,7 +23749,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -23783,7 +23783,7 @@ ...@@ -23783,7 +23783,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -23817,7 +23817,7 @@ ...@@ -23817,7 +23817,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -23851,7 +23851,7 @@ ...@@ -23851,7 +23851,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -23885,7 +23885,7 @@ ...@@ -23885,7 +23885,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -23923,7 +23923,7 @@ ...@@ -23923,7 +23923,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -23966,7 +23966,7 @@ ...@@ -23966,7 +23966,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -24009,7 +24009,7 @@ ...@@ -24009,7 +24009,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -24052,7 +24052,7 @@ ...@@ -24052,7 +24052,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -24095,7 +24095,7 @@ ...@@ -24095,7 +24095,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -24121,7 +24121,7 @@ ...@@ -24121,7 +24121,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -24155,7 +24155,7 @@ ...@@ -24155,7 +24155,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -24190,7 +24190,7 @@ ...@@ -24190,7 +24190,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -24224,7 +24224,7 @@ ...@@ -24224,7 +24224,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -24260,7 +24260,7 @@ ...@@ -24260,7 +24260,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -24297,7 +24297,7 @@ ...@@ -24297,7 +24297,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -24333,7 +24333,7 @@ ...@@ -24333,7 +24333,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -24369,7 +24369,7 @@ ...@@ -24369,7 +24369,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -24405,7 +24405,7 @@ ...@@ -24405,7 +24405,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -24440,7 +24440,7 @@ ...@@ -24440,7 +24440,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0|Mac-10.16", "os": "Mac-11.0",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
......
...@@ -551,7 +551,7 @@ ...@@ -551,7 +551,7 @@
'swarming': { 'swarming': {
'dimensions': { 'dimensions': {
'cpu': 'arm64', 'cpu': 'arm64',
'os': 'Mac-11.0|Mac-10.16', 'os': 'Mac-11.0',
'pool': 'chromium.tests.mac-arm64', 'pool': 'chromium.tests.mac-arm64',
}, },
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment