Skip to content

Commit 52f8f67

Browse files
committed
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 <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Carlos Amedee <[email protected]>
1 parent 1a1d571 commit 52f8f67

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

dashboard/builders.go

+12-3
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ var Hosts = map[string]*HostConfig{
291291
VMImage: "freebsd-amd64-103-b",
292292
Notes: "FreeBSD 10.3; GCE VM is built from script in build/env/freebsd-amd64",
293293
machineType: "n1-highcpu-4",
294-
buildletURLTmpl: "http://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64", // TODO(bradfitz): why was this http instead of https?
294+
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64",
295295
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
296296
env: []string{"CC=clang"},
297297
SSHUsername: "gopher",
@@ -308,7 +308,16 @@ var Hosts = map[string]*HostConfig{
308308
VMImage: "freebsd-amd64-111-b",
309309
Notes: "FreeBSD 11.1; GCE VM is built from script in build/env/freebsd-amd64",
310310
machineType: "n1-highcpu-4",
311-
buildletURLTmpl: "http://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64", // TODO(bradfitz): why was this http instead of https?
311+
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64",
312+
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
313+
env: []string{"CC=clang"},
314+
SSHUsername: "gopher",
315+
},
316+
"host-freebsd-11_1-big": &HostConfig{
317+
VMImage: "freebsd-amd64-111-b",
318+
Notes: "Same as host-freebsd-11_1, but on n1-highcpu-8",
319+
machineType: "n1-highcpu-8", // 8 vCPUs, 7.2 GB mem
320+
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64",
312321
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
313322
env: []string{"CC=clang"},
314323
SSHUsername: "gopher",
@@ -1437,7 +1446,7 @@ func init() {
14371446
})
14381447
addBuilder(BuildConfig{
14391448
Name: "freebsd-amd64-race",
1440-
HostType: "host-freebsd-11_1",
1449+
HostType: "host-freebsd-11_1-big",
14411450
})
14421451
addBuilder(BuildConfig{
14431452
Name: "freebsd-386-10_3",

0 commit comments

Comments
 (0)