diff options
| author |  Ben Wagner <benjaminwagner@google.com> | 2018-02-09 10:29:09 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-09 16:18:17 +0000 |
| commit | e7b8fea74a337808485fc0a1861a8f37410accce (patch) | |
| tree | 628c5aa182649b2bdda5c07bca745626d84ff9ef /infra | |
| parent | 3b2ebbb2d49d41553ff17d64202e2046b1af1560 (diff) | |
Add CPU dimension for MacMini7.1.
No-Try: true
Change-Id: Ia55bb4bf1e4de5167ed181f4dfcde9210e7a447c
Reviewed-on: https://skia-review.googlesource.com/106024
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra')
| -rw-r--r-- | infra/bots/gen_tasks.go | 5 | ||||
| -rw-r--r-- | infra/bots/tasks.json | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index 216f3e687f..4e0f278bd0 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -343,6 +343,11 @@ func defaultSwarmDimensions(parts map[string]string) []string { "IntelHD615": "Mac-10.13.3", "IntelIris5100": "Mac-10.13.1", }[parts["cpu_or_gpu_value"]] + // Yuck. We have two different types of MacMini7,1 with the same GPU but different CPUs. + if parts["cpu_or_gpu_value"] == "IntelIris5100" { + // Run all tasks on Golo machines for now. + d["cpu"] = "x86-64-i7-4578U" + } } else if strings.Contains(parts["os"], "ChromeOS") { version, ok := map[string]string{ "MaliT604": "9901.12.0", diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index aa5edb5402..0594b68188 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -9949,6 +9949,7 @@ "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ + "cpu:x86-64-i7-4578U", "gpu:8086:0a2e", "os:Mac-10.13.1", "pool:Skia" @@ -9996,6 +9997,7 @@ "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ + "cpu:x86-64-i7-4578U", "gpu:8086:0a2e", "os:Mac-10.13.1", "pool:Skia" @@ -10043,6 +10045,7 @@ "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ + "cpu:x86-64-i7-4578U", "gpu:8086:0a2e", "os:Mac-10.13.1", "pool:Skia" @@ -19709,6 +19712,7 @@ "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ + "cpu:x86-64-i7-4578U", "gpu:8086:0a2e", "os:Mac-10.13.1", "pool:Skia" @@ -19757,6 +19761,7 @@ "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ + "cpu:x86-64-i7-4578U", "gpu:8086:0a2e", "os:Mac-10.13.1", "pool:Skia" @@ -19805,6 +19810,7 @@ "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ + "cpu:x86-64-i7-4578U", "gpu:8086:0a2e", "os:Mac-10.13.1", "pool:Skia" @@ -19853,6 +19859,7 @@ "Housekeeper-PerCommit-BundleRecipes" ], "dimensions": [ + "cpu:x86-64-i7-4578U", "gpu:8086:0a2e", "os:Mac-10.13.1", "pool:Skia" |