Skip to content

A
angle
Commit a8d98f7a by Jamie Madill Committed by Commit Bot
Options

infra: Update mixins.

The Mac mixins were updated. Ideally we could do this automatically on Chromium rolls. Bug: angleproject:5114 Change-Id: I412e227193e7a6503c04dee5df6bb2a4cf1cc1f5 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2857597Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 422ec18a
Showing with 24 additions and 3 deletions
infra/specs/angle.json
...@@ -689,6 +689,7 @@ ...@@ -689,6 +689,7 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86-64",
"gpu": "1002:6821", "gpu": "1002:6821",
"hidpi": "1", "hidpi": "1",
"os": "Mac-10.14.6", "os": "Mac-10.14.6",
...@@ -716,6 +717,7 @@ ...@@ -716,6 +717,7 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86-64",
"gpu": "1002:6821", "gpu": "1002:6821",
"hidpi": "1", "hidpi": "1",
"os": "Mac-10.14.6", "os": "Mac-10.14.6",
...@@ -743,6 +745,7 @@ ...@@ -743,6 +745,7 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86-64",
"gpu": "1002:6821", "gpu": "1002:6821",
"hidpi": "1", "hidpi": "1",
"os": "Mac-10.14.6", "os": "Mac-10.14.6",
...@@ -770,6 +773,7 @@ ...@@ -770,6 +773,7 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86-64",
"gpu": "1002:6821", "gpu": "1002:6821",
"hidpi": "1", "hidpi": "1",
"os": "Mac-10.14.6", "os": "Mac-10.14.6",
...@@ -797,6 +801,7 @@ ...@@ -797,6 +801,7 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86-64",
"gpu": "1002:6821", "gpu": "1002:6821",
"hidpi": "1", "hidpi": "1",
"os": "Mac-10.14.6", "os": "Mac-10.14.6",
...@@ -825,6 +830,7 @@ ...@@ -825,6 +830,7 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86-64",
"gpu": "1002:6821", "gpu": "1002:6821",
"hidpi": "1", "hidpi": "1",
"os": "Mac-10.14.6", "os": "Mac-10.14.6",
...@@ -853,6 +859,7 @@ ...@@ -853,6 +859,7 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86-64",
"gpu": "1002:6821", "gpu": "1002:6821",
"hidpi": "1", "hidpi": "1",
"os": "Mac-10.14.6", "os": "Mac-10.14.6",
...@@ -879,6 +886,7 @@ ...@@ -879,6 +886,7 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86-64",
"gpu": "1002:6821", "gpu": "1002:6821",
"hidpi": "1", "hidpi": "1",
"os": "Mac-10.14.6", "os": "Mac-10.14.6",
...@@ -912,6 +920,7 @@ ...@@ -912,6 +920,7 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86-64",
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.15.5" "os": "Mac-10.15.5"
} }
...@@ -937,6 +946,7 @@ ...@@ -937,6 +946,7 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86-64",
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.15.5" "os": "Mac-10.15.5"
} }
...@@ -962,6 +972,7 @@ ...@@ -962,6 +972,7 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86-64",
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.15.5" "os": "Mac-10.15.5"
} }
...@@ -987,6 +998,7 @@ ...@@ -987,6 +998,7 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86-64",
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.15.5" "os": "Mac-10.15.5"
} }
...@@ -1012,6 +1024,7 @@ ...@@ -1012,6 +1024,7 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86-64",
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.15.5" "os": "Mac-10.15.5"
} }
...@@ -1038,6 +1051,7 @@ ...@@ -1038,6 +1051,7 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86-64",
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.15.5" "os": "Mac-10.15.5"
} }
...@@ -1064,6 +1078,7 @@ ...@@ -1064,6 +1078,7 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86-64",
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.15.5" "os": "Mac-10.15.5"
} }
...@@ -1088,6 +1103,7 @@ ...@@ -1088,6 +1103,7 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86-64",
"gpu": "8086:0a2e", "gpu": "8086:0a2e",
"os": "Mac-10.15.5" "os": "Mac-10.15.5"
} }
...@@ -1117,6 +1133,7 @@ ...@@ -1117,6 +1133,7 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86-64",
"gpu": "10de:0fe9", "gpu": "10de:0fe9",
"hidpi": "1", "hidpi": "1",
"os": "Mac-10.14.6", "os": "Mac-10.14.6",
...@@ -1143,6 +1160,7 @@ ...@@ -1143,6 +1160,7 @@
"containment_type": "AUTO", "containment_type": "AUTO",
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "x86-64",
"gpu": "10de:0fe9", "gpu": "10de:0fe9",
"hidpi": "1", "hidpi": "1",
"os": "Mac-10.14.6", "os": "Mac-10.14.6",
......
infra/specs/mixins.pyl
...@@ -25,13 +25,16 @@ ...@@ -25,13 +25,16 @@
'linux_nvidia_quadro_p400_stable': { 'swarming': { 'dimensions': { 'gpu': '10de:1cb3-418.56', 'linux_nvidia_quadro_p400_stable': { 'swarming': { 'dimensions': { 'gpu': '10de:1cb3-418.56',
'os': 'Ubuntu-19.04', 'os': 'Ubuntu-19.04',
'pool': 'chromium.tests.gpu'}}}, 'pool': 'chromium.tests.gpu'}}},
'mac_mini_intel_gpu_stable': { 'swarming': { 'dimensions': { 'gpu': '8086:0a2e', 'mac_mini_intel_gpu_stable': { 'swarming': { 'dimensions': { 'cpu': 'x86-64',
'gpu': '8086:0a2e',
'os': 'Mac-10.15.5'}}}, 'os': 'Mac-10.15.5'}}},
'mac_retina_amd_gpu_stable': { 'swarming': { 'dimensions': { 'gpu': '1002:6821', 'mac_retina_amd_gpu_stable': { 'swarming': { 'dimensions': { 'cpu': 'x86-64',
'gpu': '1002:6821',
'hidpi': '1', 'hidpi': '1',
'os': 'Mac-10.14.6', 'os': 'Mac-10.14.6',
'pool': 'chromium.tests.gpu'}}}, 'pool': 'chromium.tests.gpu'}}},
'mac_retina_nvidia_gpu_stable': { 'swarming': { 'dimensions': { 'gpu': '10de:0fe9', 'mac_retina_nvidia_gpu_stable': { 'swarming': { 'dimensions': { 'cpu': 'x86-64',
'gpu': '10de:0fe9',
'hidpi': '1', 'hidpi': '1',
'os': 'Mac-10.14.6', 'os': 'Mac-10.14.6',
'pool': 'chromium.tests.gpu'}}}, 'pool': 'chromium.tests.gpu'}}},
......
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