diff options
author | 2018-03-14 11:23:47 -0400 | |
---|---|---|
committer | 2018-03-14 17:16:52 +0000 | |
commit | e462b80d966f006c5164f1cad90f79d916b61a6b (patch) | |
tree | 5ff82f4dda7021fb698dcf9522bd9d3762880948 /infra/bots/gen_tasks.go | |
parent | 7e1560616f8ebc617b533306ed84ebb6974fda9c (diff) |
Remove Goma builds and support in gn_flavor.
The experiment with using Goma to speed up Windows compiles was very
close to being successful, but at this point the ongoing maintenance
does not seem to be worth the 50-70 seconds saved.
Change-Id: Ie3900b9a681e448a3e47634efbab7695ebccad33
Reviewed-on: https://skia-review.googlesource.com/114363
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/bots/gen_tasks.go')
-rw-r--r-- | infra/bots/gen_tasks.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index 5b9016565f..d111c923af 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -373,12 +373,8 @@ func defaultSwarmDimensions(parts map[string]string) []string { } else if d["os"] == DEFAULT_OS_WIN { // Windows CPU bots. d["cpu"] = "x86-64-Haswell_GCE" - // 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" - } + // Use many-core machines for Build tasks on Win GCE. + d["machine_type"] = "n1-highcpu-64" } else if d["os"] == DEFAULT_OS_MAC { // Mac CPU bots. d["cpu"] = "x86-64-E5-2697_v2" |