From db816992bb979850853965e0f03565a535204e7d Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Fri, 18 Aug 2017 08:30:15 -0400 Subject: [PATCH] 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 Commit-Queue: Ben Wagner --- infra/bots/gen_tasks.go | 4 ---- 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,