diff options
| author |  Ben Wagner <benjaminwagner@google.com> | 2017-08-18 08:30:15 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-23 14:21:56 +0000 |
| commit | db816992bb979850853965e0f03565a535204e7d (patch) | |
| tree | 89afecf1995ccdbfaf81e750390312cd43901df7 /infra | |
| parent | 2cee283fda939dd982900a9e9a03bd29b69a0d6c (diff) | |
Update Mac CPU tasks to 10.12.
Failing tests were disabled in https://skia-review.googlesource.com/36440
No-Try: true
Change-Id: Icd123f53aa6df24850bf72d16e7685799d9e1e37
Reviewed-on: https://skia-review.googlesource.com/36200
Reviewed-by: Stephan Altmueller <stephana@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra')
| -rw-r--r-- | infra/bots/gen_tasks.go | 4 | ||||
| -rw-r--r-- | infra/bots/tasks.json | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index 616acc44a8..9d9efe97de 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -188,10 +188,6 @@ func defaultSwarmDimensions(parts map[string]string) []string { if parts["model"] == "Golo" && os == "Win10" && parts["cpu_or_gpu_value"] == "GT610" { d["os"] = "Windows-10-10586" } - // This machine hasn't been upgraded yet. - if parts["model"] == "MacMini7.1" && os == "Mac" && parts["cpu_or_gpu"] == "CPU" { - d["os"] = "Mac-10.11" - } } else { d["os"] = DEFAULT_OS_DEBIAN } diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 51736eeda2..8bfba4f728 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -7707,7 +7707,7 @@ "dimensions": [ "cpu:x86-64", "gpu:none", - "os:Mac-10.11", + "os:Mac-10.12", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -7755,7 +7755,7 @@ "dimensions": [ "cpu:x86-64", "gpu:none", - "os:Mac-10.11", + "os:Mac-10.12", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -15097,7 +15097,7 @@ "dimensions": [ "cpu:x86-64", "gpu:none", - "os:Mac-10.11", + "os:Mac-10.12", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -15145,7 +15145,7 @@ "dimensions": [ "cpu:x86-64", "gpu:none", - "os:Mac-10.11", + "os:Mac-10.12", "pool:Skia" ], "execution_timeout_ns": 14400000000000, |