dashboard: add n2 and n2d hosts for OpenBSD and NetBSD
We recently migrated in CL 354757 from n1 to e2 hosts around the same
time issues started appearing with these builders. n1 hosts are notably
different in that they are older generation CPUs with hyperthreading
disabled.
e2 hosts may sometimes be AMD CPUs. n2d hosts are always AMD,
so this helps bisect the problem. n2 hosts are always Intel.
For golang/go#49209
Change-Id: I60334b44e192b0b95293891b380f2a89227b9235
Reviewed-on: https://go-review.googlesource.com/c/build/+/367534
Trust: Alexander Rakoczy <alex@golang.org>
Run-TryBot: Alexander Rakoczy <alex@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
diff --git a/dashboard/builders.go b/dashboard/builders.go
index f5ab127..cee2eca 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -268,6 +268,22 @@
Notes: "OpenBSD 7.0; GCE VM is built from script in build/env/openbsd-amd64. n1-highcpu host.",
SSHUsername: "gopher",
},
+ "host-openbsd-amd64-70-n2": &HostConfig{
+ VMImage: "openbsd-amd64-70",
+ machineType: "n2-highcpu-4",
+ buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-amd64",
+ goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-amd64-go1_12.tar.gz",
+ Notes: "OpenBSD 7.0; GCE VM is built from script in build/env/openbsd-amd64. n2-highcpu host.",
+ SSHUsername: "gopher",
+ },
+ "host-openbsd-amd64-70-n2d": &HostConfig{
+ VMImage: "openbsd-amd64-70",
+ machineType: "n2d-highcpu-4",
+ buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-amd64",
+ goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-amd64-go1_12.tar.gz",
+ Notes: "OpenBSD 7.0; GCE VM is built from script in build/env/openbsd-amd64. n2d-highcpu host.",
+ SSHUsername: "gopher",
+ },
"host-openbsd-386-70": &HostConfig{
VMImage: "openbsd-386-70",
machineType: "e2-highcpu-4",
@@ -284,6 +300,22 @@
Notes: "OpenBSD 7.0; GCE VM is built from script in build/env/openbsd-386. n1-highcpu host.",
SSHUsername: "gopher",
},
+ "host-openbsd-386-70-n2": &HostConfig{
+ VMImage: "openbsd-386-70",
+ machineType: "n2-highcpu-4",
+ buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-386",
+ goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-386-go1_12.tar.gz",
+ Notes: "OpenBSD 7.0; GCE VM is built from script in build/env/openbsd-386. n2-highcpu host.",
+ SSHUsername: "gopher",
+ },
+ "host-openbsd-386-70-n2d": &HostConfig{
+ VMImage: "openbsd-386-70",
+ machineType: "n2d-highcpu-4",
+ buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-386",
+ goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-386-go1_12.tar.gz",
+ Notes: "OpenBSD 7.0; GCE VM is built from script in build/env/openbsd-386. n2d-highcpu host.",
+ SSHUsername: "gopher",
+ },
"host-openbsd-arm-joelsing": &HostConfig{
IsReverse: true,
ExpectNum: 1,
@@ -358,6 +390,22 @@
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-netbsd-amd64-2da6b33.tar.gz",
SSHUsername: "root",
},
+ "host-netbsd-amd64-9_0-n2": &HostConfig{
+ VMImage: "netbsd-amd64-9-0-2019q4",
+ Notes: "NetBSD 9.0; GCE VM is built from script in build/env/netbsd-amd64. n2-highcpu host.",
+ machineType: "n2-highcpu-4",
+ buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.netbsd-amd64",
+ goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-netbsd-amd64-2da6b33.tar.gz",
+ SSHUsername: "root",
+ },
+ "host-netbsd-amd64-9_0-n2d": &HostConfig{
+ VMImage: "netbsd-amd64-9-0-2019q4",
+ Notes: "NetBSD 9.0; GCE VM is built from script in build/env/netbsd-amd64. n2d-highcpu host.",
+ machineType: "n2d-highcpu-4",
+ buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.netbsd-amd64",
+ goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-netbsd-amd64-2da6b33.tar.gz",
+ SSHUsername: "root",
+ },
"host-netbsd-386-9_0": &HostConfig{
VMImage: "netbsd-i386-9-0-2019q4",
Notes: "NetBSD 9.0; GCE VM is built from script in build/env/netbsd-386",
@@ -374,6 +422,22 @@
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-netbsd-386-0b3b511.tar.gz",
SSHUsername: "root",
},
+ "host-netbsd-386-9_0-n2": &HostConfig{
+ VMImage: "netbsd-i386-9-0-2019q4",
+ Notes: "NetBSD 9.0; GCE VM is built from script in build/env/netbsd-386. n2-highcpu host.",
+ machineType: "n2-highcpu-4",
+ buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.netbsd-386",
+ goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-netbsd-386-0b3b511.tar.gz",
+ SSHUsername: "root",
+ },
+ "host-netbsd-386-9_0-n2d": &HostConfig{
+ VMImage: "netbsd-i386-9-0-2019q4",
+ Notes: "NetBSD 9.0; GCE VM is built from script in build/env/netbsd-386. n2d-highcpu host.",
+ machineType: "n2d-highcpu-4",
+ buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.netbsd-386",
+ goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-netbsd-386-0b3b511.tar.gz",
+ SSHUsername: "root",
+ },
"host-netbsd-arm-bsiegert": &HostConfig{
IsReverse: true,
ExpectNum: 1,
@@ -2024,6 +2088,26 @@
numTryTestHelpers: 4,
})
addBuilder(BuildConfig{
+ Name: "openbsd-amd64-70-n2",
+ HostType: "host-openbsd-amd64-70-n2",
+ distTestAdjust: noTestDirAndNoReboot,
+ buildsRepo: func(repo, branch, goBranch string) bool {
+ // https://github.com/golang/go/issues/48977#issuecomment-971763553:
+ // 1.16 seems to be incompatible with 7.0.
+ return atLeastGo1(goBranch, 17) && buildRepoByDefault(repo)
+ },
+ })
+ addBuilder(BuildConfig{
+ Name: "openbsd-amd64-70-n2d",
+ HostType: "host-openbsd-amd64-70-n2d",
+ distTestAdjust: noTestDirAndNoReboot,
+ buildsRepo: func(repo, branch, goBranch string) bool {
+ // https://github.com/golang/go/issues/48977#issuecomment-971763553:
+ // 1.16 seems to be incompatible with 7.0.
+ return atLeastGo1(goBranch, 17) && buildRepoByDefault(repo)
+ },
+ })
+ addBuilder(BuildConfig{
Name: "openbsd-386-70",
HostType: "host-openbsd-386-70",
tryBot: explicitTrySet("sys"),
@@ -2058,6 +2142,36 @@
numTryTestHelpers: 4,
})
addBuilder(BuildConfig{
+ Name: "openbsd-386-70-n2",
+ HostType: "host-openbsd-386-70-n2",
+ buildsRepo: func(repo, branch, goBranch string) bool {
+ if repo == "review" {
+ // https://golang.org/issue/49529: git seems to be too slow on this
+ // platform.
+ return false
+ }
+ // https://github.com/golang/go/issues/48977#issuecomment-971763553:
+ // 1.16 seems to be incompatible with 7.0.
+ return atLeastGo1(goBranch, 17) && buildRepoByDefault(repo)
+ },
+ distTestAdjust: noTestDirAndNoReboot,
+ })
+ addBuilder(BuildConfig{
+ Name: "openbsd-386-70-n2d",
+ HostType: "host-openbsd-386-70-n2d",
+ buildsRepo: func(repo, branch, goBranch string) bool {
+ if repo == "review" {
+ // https://golang.org/issue/49529: git seems to be too slow on this
+ // platform.
+ return false
+ }
+ // https://github.com/golang/go/issues/48977#issuecomment-971763553:
+ // 1.16 seems to be incompatible with 7.0.
+ return atLeastGo1(goBranch, 17) && buildRepoByDefault(repo)
+ },
+ distTestAdjust: noTestDirAndNoReboot,
+ })
+ addBuilder(BuildConfig{
Name: "openbsd-arm-jsing",
HostType: "host-openbsd-arm-joelsing",
SkipSnapshot: true,
@@ -2127,6 +2241,16 @@
tryBot: explicitTrySet("sys"),
})
addBuilder(BuildConfig{
+ Name: "netbsd-amd64-9_0-n2",
+ HostType: "host-netbsd-amd64-9_0-n2",
+ distTestAdjust: noTestDirAndNoReboot,
+ })
+ addBuilder(BuildConfig{
+ Name: "netbsd-amd64-9_0-n2d",
+ HostType: "host-netbsd-amd64-9_0-n2d",
+ distTestAdjust: noTestDirAndNoReboot,
+ })
+ addBuilder(BuildConfig{
Name: "netbsd-386-9_0",
HostType: "host-netbsd-386-9_0",
distTestAdjust: noTestDirAndNoReboot,
@@ -2137,6 +2261,16 @@
distTestAdjust: noTestDirAndNoReboot,
})
addBuilder(BuildConfig{
+ Name: "netbsd-386-9_0-n2",
+ HostType: "host-netbsd-386-9_0-n2",
+ distTestAdjust: noTestDirAndNoReboot,
+ })
+ addBuilder(BuildConfig{
+ Name: "netbsd-386-9_0-n2d",
+ HostType: "host-netbsd-386-9_0-n2d",
+ distTestAdjust: noTestDirAndNoReboot,
+ })
+ addBuilder(BuildConfig{
Name: "netbsd-arm-bsiegert",
HostType: "host-netbsd-arm-bsiegert",
buildsRepo: func(repo, branch, goBranch string) bool {
