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: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

infra: Update mixins.
a8d98f7a · Jamie Madill · Commit Bot · 422ec18a · a8d98f7a · a8d98f7a
Commit a8d98f7a authored Apr 29, 2021 by Jamie Madill Committed by Commit Bot Apr 29, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 24 additions and 3 deletions

angle.json infra/specs/angle.json +18 -0

mixins.pyl infra/specs/mixins.pyl +6 -3

No files found.
--- a/infra/specs/angle.json
+++ b/infra/specs/angle.json
@@ -689,6 +689,7 @@
          "containment_type": "AUTO",
          "dimension_sets": [
            {
+              "cpu": "x86-64",
              "gpu": "1002:6821",
              "hidpi": "1",
              "os": "Mac-10.14.6",
@@ -716,6 +717,7 @@
          "containment_type": "AUTO",
          "dimension_sets": [
            {
+              "cpu": "x86-64",
              "gpu": "1002:6821",
              "hidpi": "1",
              "os": "Mac-10.14.6",
@@ -743,6 +745,7 @@
          "containment_type": "AUTO",
          "dimension_sets": [
            {
+              "cpu": "x86-64",
              "gpu": "1002:6821",
              "hidpi": "1",
              "os": "Mac-10.14.6",
@@ -770,6 +773,7 @@
          "containment_type": "AUTO",
          "dimension_sets": [
            {
+              "cpu": "x86-64",
              "gpu": "1002:6821",
              "hidpi": "1",
              "os": "Mac-10.14.6",
@@ -797,6 +801,7 @@
          "containment_type": "AUTO",
          "dimension_sets": [
            {
+              "cpu": "x86-64",
              "gpu": "1002:6821",
              "hidpi": "1",
              "os": "Mac-10.14.6",
@@ -825,6 +830,7 @@
          "containment_type": "AUTO",
          "dimension_sets": [
            {
+              "cpu": "x86-64",
              "gpu": "1002:6821",
              "hidpi": "1",
              "os": "Mac-10.14.6",
@@ -853,6 +859,7 @@
          "containment_type": "AUTO",
          "dimension_sets": [
            {
+              "cpu": "x86-64",
              "gpu": "1002:6821",
              "hidpi": "1",
              "os": "Mac-10.14.6",
@@ -879,6 +886,7 @@
          "containment_type": "AUTO",
          "dimension_sets": [
            {
+              "cpu": "x86-64",
              "gpu": "1002:6821",
              "hidpi": "1",
              "os": "Mac-10.14.6",
@@ -912,6 +920,7 @@
          "containment_type": "AUTO",
          "dimension_sets": [
            {
+              "cpu": "x86-64",
              "gpu": "8086:0a2e",
              "os": "Mac-10.15.5"
            }
@@ -937,6 +946,7 @@
          "containment_type": "AUTO",
          "dimension_sets": [
            {
+              "cpu": "x86-64",
              "gpu": "8086:0a2e",
              "os": "Mac-10.15.5"
            }
@@ -962,6 +972,7 @@
          "containment_type": "AUTO",
          "dimension_sets": [
            {
+              "cpu": "x86-64",
              "gpu": "8086:0a2e",
              "os": "Mac-10.15.5"
            }
@@ -987,6 +998,7 @@
          "containment_type": "AUTO",
          "dimension_sets": [
            {
+              "cpu": "x86-64",
              "gpu": "8086:0a2e",
              "os": "Mac-10.15.5"
            }
@@ -1012,6 +1024,7 @@
          "containment_type": "AUTO",
          "dimension_sets": [
            {
+              "cpu": "x86-64",
              "gpu": "8086:0a2e",
              "os": "Mac-10.15.5"
            }
@@ -1038,6 +1051,7 @@
          "containment_type": "AUTO",
          "dimension_sets": [
            {
+              "cpu": "x86-64",
              "gpu": "8086:0a2e",
              "os": "Mac-10.15.5"
            }
@@ -1064,6 +1078,7 @@
          "containment_type": "AUTO",
          "dimension_sets": [
            {
+              "cpu": "x86-64",
              "gpu": "8086:0a2e",
              "os": "Mac-10.15.5"
            }
@@ -1088,6 +1103,7 @@
          "containment_type": "AUTO",
          "dimension_sets": [
            {
+              "cpu": "x86-64",
              "gpu": "8086:0a2e",
              "os": "Mac-10.15.5"
            }
@@ -1117,6 +1133,7 @@
          "containment_type": "AUTO",
          "dimension_sets": [
            {
+              "cpu": "x86-64",
              "gpu": "10de:0fe9",
              "hidpi": "1",
              "os": "Mac-10.14.6",
@@ -1143,6 +1160,7 @@
          "containment_type": "AUTO",
          "dimension_sets": [
            {
+              "cpu": "x86-64",
              "gpu": "10de:0fe9",
              "hidpi": "1",
              "os": "Mac-10.14.6",

--- a/infra/specs/mixins.pyl
+++ b/infra/specs/mixins.pyl
@@ -25,13 +25,16 @@
  'linux_nvidia_quadro_p400_stable': { 'swarming': { 'dimensions': { 'gpu': '10de:1cb3-418.56',
                                                                     'os': 'Ubuntu-19.04',
                                                                     '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'}}},
-  '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',
                                                               'os': 'Mac-10.14.6',
                                                               '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',
                                                                  'os': 'Mac-10.14.6',
                                                                  'pool': 'chromium.tests.gpu'}}},