AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update Mac CPU tasks to 10.12.

Browse Source 
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>
This commit is contained in:
Ben Wagner 2017-08-18 08:30:15 -04:00 committed by Skia Commit-Bot
parent 2cee283fda
commit db816992bb
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infra/bots/gen_tasks.go
View File

@ -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
}

8
infra/bots/tasks.json
View File

@ -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,