Skip to content

GitLab

T
tangled
Commit 7593a97e authored by Lindsay Pasricha's avatar Lindsay Pasricha Committed by Commit Bot
Browse files
Options

Add OR dimension for MacOS 11.0, 10.16 

Bug: 1141723
Change-Id: Ia4795156483d4ec32b8670682718c7f5db4088c3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2493689
Commit-Queue: Lindsay Pasricha <lindsayw@chromium.org>
Reviewed-by: default avatarErik Staab <estaab@chromium.org>
Reviewed-by: default avatarMark Mentovai <mark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820535}
parent 650f49ce
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 321 additions and 321 deletions
infra/config/lib/builders.star
View file @ 7593a97e
...@@ -64,7 +64,7 @@ os = struct( ...@@ -64,7 +64,7 @@ os = struct(
MAC_10_13 = os_enum("Mac-10.13", os_category.MAC), MAC_10_13 = os_enum("Mac-10.13", os_category.MAC),
MAC_10_14 = os_enum("Mac-10.14", os_category.MAC), MAC_10_14 = os_enum("Mac-10.14", os_category.MAC),
MAC_10_15 = os_enum("Mac-10.15", os_category.MAC), MAC_10_15 = os_enum("Mac-10.15", os_category.MAC),
MAC_11_0 = os_enum("Mac-11.0", os_category.MAC), MAC_11_0 = os_enum("Mac-11.0|Mac-10.16", os_category.MAC),
MAC_DEFAULT = os_enum("Mac-10.15", os_category.MAC), MAC_DEFAULT = os_enum("Mac-10.15", os_category.MAC),
MAC_ANY = os_enum("Mac", os_category.MAC), MAC_ANY = os_enum("Mac", os_category.MAC),
WINDOWS_7 = os_enum("Windows-7", os_category.WINDOWS), WINDOWS_7 = os_enum("Windows-7", os_category.WINDOWS),
......
testing/buildbot/chromium.fyi.json
View file @ 7593a97e
This diff is collapsed.
testing/buildbot/chromium.gpu.fyi.json
View file @ 7593a97e
...@@ -19852,7 +19852,7 @@ ...@@ -19852,7 +19852,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -19877,7 +19877,7 @@ ...@@ -19877,7 +19877,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -19905,7 +19905,7 @@ ...@@ -19905,7 +19905,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -19931,7 +19931,7 @@ ...@@ -19931,7 +19931,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -19956,7 +19956,7 @@ ...@@ -19956,7 +19956,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -19979,7 +19979,7 @@ ...@@ -19979,7 +19979,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20002,7 +20002,7 @@ ...@@ -20002,7 +20002,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20022,7 +20022,7 @@ ...@@ -20022,7 +20022,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20046,7 +20046,7 @@ ...@@ -20046,7 +20046,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20066,7 +20066,7 @@ ...@@ -20066,7 +20066,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20099,7 +20099,7 @@ ...@@ -20099,7 +20099,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20130,7 +20130,7 @@ ...@@ -20130,7 +20130,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20161,7 +20161,7 @@ ...@@ -20161,7 +20161,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20192,7 +20192,7 @@ ...@@ -20192,7 +20192,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20223,7 +20223,7 @@ ...@@ -20223,7 +20223,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20258,7 +20258,7 @@ ...@@ -20258,7 +20258,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20298,7 +20298,7 @@ ...@@ -20298,7 +20298,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20338,7 +20338,7 @@ ...@@ -20338,7 +20338,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20378,7 +20378,7 @@ ...@@ -20378,7 +20378,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20418,7 +20418,7 @@ ...@@ -20418,7 +20418,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20444,7 +20444,7 @@ ...@@ -20444,7 +20444,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20475,7 +20475,7 @@ ...@@ -20475,7 +20475,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20507,7 +20507,7 @@ ...@@ -20507,7 +20507,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20538,7 +20538,7 @@ ...@@ -20538,7 +20538,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20571,7 +20571,7 @@ ...@@ -20571,7 +20571,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20605,7 +20605,7 @@ ...@@ -20605,7 +20605,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20638,7 +20638,7 @@ ...@@ -20638,7 +20638,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20671,7 +20671,7 @@ ...@@ -20671,7 +20671,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20704,7 +20704,7 @@ ...@@ -20704,7 +20704,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
...@@ -20736,7 +20736,7 @@ ...@@ -20736,7 +20736,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"os": "Mac-11.0", "os": "Mac-11.0|Mac-10.16",
"pool": "chromium.tests.mac-arm64" "pool": "chromium.tests.mac-arm64"
} }
], ],
testing/buildbot/mixins.pyl
View file @ 7593a97e
...@@ -520,7 +520,7 @@ ...@@ -520,7 +520,7 @@
'mac_11.0_beta': { 'mac_11.0_beta': {
'swarming': { 'swarming': {
'dimensions': { 'dimensions': {
'os': 'Mac-11.0', 'os': 'Mac-11.0|Mac-10.16',
}, },
}, },
}, },
...@@ -528,7 +528,7 @@ ...@@ -528,7 +528,7 @@
'swarming': { 'swarming': {
'dimensions': { 'dimensions': {
'cpu': 'arm64', 'cpu': 'arm64',
'os': 'Mac-11.0', 'os': 'Mac-11.0|Mac-10.16',
'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