From 52f8f6733397ddc92faa0981feabff78f2d2005d Mon Sep 17 00:00:00 2001 From: Dmitri Shuralyov Date: Mon, 13 Jan 2020 11:26:43 -0500 Subject: [PATCH] dashboard: upsize freebsd-amd64-race builder to 7.2 GB RAM Start using n1-highcpu-8 machine type instead of n1-highcpu-4 for the freebsd-amd64-race builder. The freebsd-amd64-race builder has produced good test results for the x/tools repo for a long time, but by now it has started to consistently fail for reasons that seem connected to it having only 3.6 GB memory. The Windows race builders needed to be bumped from 7.2 GB to 14.4 GB to run successfully, so this change makes a small incremental step to bring freebsd-amd64-race closer in line with other builders. If memory-related problems continue to occur with 7.2 GB, the next step will be to go up to 14.4 GB. The freebsd-amd64-race builder is using an older version of FreeBSD. We may want to start using a newer one for running tests with -race, but that should be a separate change so we can see the results of this change without another confounding variable. Also update all FreeBSD builders to use https in buildletURLTmpl, because it's expected to work fine and will be more consistent. Updates golang/go#36444 Updates golang/go#34621 Updates golang/go#29252 Updates golang/go#33986 Change-Id: Idfcefd1c91bddc9f70ab23e02fcdca54fda9d1ac Reviewed-on: https://go-review.googlesource.com/c/build/+/214433 Run-TryBot: Carlos Amedee TryBot-Result: Gobot Gobot Reviewed-by: Carlos Amedee --- dashboard/builders.go | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dashboard/builders.go b/dashboard/builders.go index 54ce5002c8..64cd989f2d 100644 --- a/dashboard/builders.go +++ b/dashboard/builders.go @@ -291,7 +291,7 @@ var Hosts = map[string]*HostConfig{ VMImage: "freebsd-amd64-103-b", Notes: "FreeBSD 10.3; GCE VM is built from script in build/env/freebsd-amd64", machineType: "n1-highcpu-4", - buildletURLTmpl: "http://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64", // TODO(bradfitz): why was this http instead of https? + buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64", goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz", env: []string{"CC=clang"}, SSHUsername: "gopher", @@ -308,7 +308,16 @@ var Hosts = map[string]*HostConfig{ VMImage: "freebsd-amd64-111-b", Notes: "FreeBSD 11.1; GCE VM is built from script in build/env/freebsd-amd64", machineType: "n1-highcpu-4", - buildletURLTmpl: "http://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64", // TODO(bradfitz): why was this http instead of https? + buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64", + goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz", + env: []string{"CC=clang"}, + SSHUsername: "gopher", + }, + "host-freebsd-11_1-big": &HostConfig{ + VMImage: "freebsd-amd64-111-b", + Notes: "Same as host-freebsd-11_1, but on n1-highcpu-8", + machineType: "n1-highcpu-8", // 8 vCPUs, 7.2 GB mem + buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64", goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz", env: []string{"CC=clang"}, SSHUsername: "gopher", @@ -1437,7 +1446,7 @@ func init() { }) addBuilder(BuildConfig{ Name: "freebsd-amd64-race", - HostType: "host-freebsd-11_1", + HostType: "host-freebsd-11_1-big", }) addBuilder(BuildConfig{ Name: "freebsd-386-10_3",