diff options
| author |  Ben Wagner <benjaminwagner@google.com> | 2017-12-15 11:23:40 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-15 17:50:18 +0000 |
| commit | 832415e395997389a82928c6bcdf9aa7bb7f8844 (patch) | |
| tree | 0b316accd1608ae8251de48c0da0d5d36f3e8bcb /infra | |
| parent | 61efab3e4ee4205863c60bcc95653d60e1257318 (diff) | |
Use n1-highcpu-64 machines for Windows Builds.
Bug: skia:7409
Change-Id: I6c9d86af147f5234a0484e43e053ce1758cb312d
Reviewed-on: https://skia-review.googlesource.com/85400
Reviewed-by: Mike Klein <mtklein@chromium.org>
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 | 10 | ||||
| -rw-r--r-- | infra/bots/tasks.json | 28 |
2 files changed, 21 insertions, 17 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index 56380d287d..1fc6f52d04 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -281,7 +281,7 @@ func defaultSwarmDimensions(parts map[string]string) []string { d["os"] = DEFAULT_OS_LINUX_GCE } if parts["model"] == "GCE" && d["os"] == DEFAULT_OS_WIN { - // skia:7409 + // Use normal-size machines for Test and Perf tasks on Win GCE. d["machine_type"] = "n1-standard-16" } } else { @@ -360,8 +360,12 @@ func defaultSwarmDimensions(parts map[string]string) []string { } else if d["os"] == DEFAULT_OS_WIN { // Windows CPU bots. d["cpu"] = "x86-64-Haswell_GCE" - // skia:7409 - d["machine_type"] = "n1-standard-16" + // Use many-core machines for Build tasks on Win GCE, except for Goma. + if strings.Contains(parts["extra_config"], "Goma") { + d["machine_type"] = "n1-standard-16" + } else { + d["machine_type"] = "n1-highcpu-64" + } } else if d["os"] == DEFAULT_OS_MAC { // Mac CPU bots. d["cpu"] = "x86-64-E5-2697_v2" diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 277abf9a66..35f8f068c8 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -4783,7 +4783,7 @@ "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", - "machine_type:n1-standard-16", + "machine_type:n1-highcpu-64", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -4817,7 +4817,7 @@ "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", - "machine_type:n1-standard-16", + "machine_type:n1-highcpu-64", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -4851,7 +4851,7 @@ "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", - "machine_type:n1-standard-16", + "machine_type:n1-highcpu-64", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -4988,7 +4988,7 @@ "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", - "machine_type:n1-standard-16", + "machine_type:n1-highcpu-64", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -5057,7 +5057,7 @@ "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", - "machine_type:n1-standard-16", + "machine_type:n1-highcpu-64", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -5091,7 +5091,7 @@ "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", - "machine_type:n1-standard-16", + "machine_type:n1-highcpu-64", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -5194,7 +5194,7 @@ "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", - "machine_type:n1-standard-16", + "machine_type:n1-highcpu-64", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -5256,7 +5256,7 @@ "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", - "machine_type:n1-standard-16", + "machine_type:n1-highcpu-64", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -5283,7 +5283,7 @@ "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", - "machine_type:n1-standard-16", + "machine_type:n1-highcpu-64", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -5310,7 +5310,7 @@ "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", - "machine_type:n1-standard-16", + "machine_type:n1-highcpu-64", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -5337,7 +5337,7 @@ "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", - "machine_type:n1-standard-16", + "machine_type:n1-highcpu-64", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -5365,7 +5365,7 @@ "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", - "machine_type:n1-standard-16", + "machine_type:n1-highcpu-64", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -5392,7 +5392,7 @@ "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", - "machine_type:n1-standard-16", + "machine_type:n1-highcpu-64", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -5420,7 +5420,7 @@ "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", - "machine_type:n1-standard-16", + "machine_type:n1-highcpu-64", "os:Windows-2016Server-14393", "pool:Skia" ], |