dashboard: increase timeout scale for longtest builders, add more CPU
Updates golang/go#25886
Change-Id: I5168e291ab77cbd3843bdc39e319a68dfa65aedd
Reviewed-on: https://go-review.googlesource.com/c/build/+/167638
Reviewed-by: Russ Cox <rsc@golang.org>
diff --git a/dashboard/builders.go b/dashboard/builders.go
index 2d3223e..6953460 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -38,6 +38,15 @@
"host-linux-stretch": &HostConfig{
Notes: "Debian Stretch",
ContainerImage: "linux-x86-stretch:latest",
+ machineType: "n1-standard-4", // 4 vCPUs, 15 GB mem
+ buildletURLTmpl: "http://storage.googleapis.com/$BUCKET/buildlet.linux-amd64",
+ env: []string{"GOROOT_BOOTSTRAP=/go1.4"},
+ SSHUsername: "root",
+ },
+ "host-linux-stretch-morecpu": &HostConfig{
+ Notes: "Debian Stretch, but on n1-highcpu-8",
+ ContainerImage: "linux-x86-stretch:latest",
+ machineType: "n1-highcpu-8", // 16 vCPUs, 14.4 GB mem
buildletURLTmpl: "http://storage.googleapis.com/$BUCKET/buildlet.linux-amd64",
env: []string{"GOROOT_BOOTSTRAP=/go1.4"},
SSHUsername: "root",
@@ -1498,7 +1507,7 @@
})
addBuilder(BuildConfig{
Name: "linux-amd64-longtest",
- HostType: "host-linux-stretch",
+ HostType: "host-linux-stretch-morecpu",
MaxAtOnce: 1,
Notes: "Debian Stretch with go test -short=false",
buildsRepo: func(repo, branch, goBranch string) bool {
@@ -1507,9 +1516,7 @@
needsGoProxy: true, // for cmd/go module tests
env: []string{
"GO_TEST_SHORT=0",
- // runtime takes ~190 seconds in long mode, which is over
- // the 180 seconds default timeout.
- "GO_TEST_TIMEOUT_SCALE=2",
+ "GO_TEST_TIMEOUT_SCALE=5", // give them lots of time
},
})
addBuilder(BuildConfig{
