dashboard: add n1 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. For golang/go#49209 Change-Id: I8b6822fbd4910602f61d504b34580282c97c0ca7 Reviewed-on: https://go-review.googlesource.com/c/build/+/365776 Trust: Alexander Rakoczy <[email protected]> Run-TryBot: Alexander Rakoczy <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
golang · Nov 19, 2021 · 87c1ba4 · 87c1ba4
1 parent 197ed45
commit 87c1ba4
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 0 deletions.
diff --git a/dashboard/builders.go b/dashboard/builders.go
@@ -260,6 +260,14 @@ var Hosts = map[string]*HostConfig{
 		Notes:              "OpenBSD 7.0; GCE VM is built from script in build/env/openbsd-amd64",
 		SSHUsername:        "gopher",
 	},
+	"host-openbsd-amd64-70-n1": &HostConfig{
+		VMImage:            "openbsd-amd64-70",
+		machineType:        "n1-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. n1-highcpu host.",
+		SSHUsername:        "gopher",
+	},
 	"host-openbsd-386-70": &HostConfig{
 		VMImage:            "openbsd-386-70",
 		machineType:        "e2-highcpu-4",
@@ -268,6 +276,14 @@ var Hosts = map[string]*HostConfig{
 		Notes:              "OpenBSD 7.0; GCE VM is built from script in build/env/openbsd-386",
 		SSHUsername:        "gopher",
 	},
+	"host-openbsd-386-70-n1": &HostConfig{
+		VMImage:            "openbsd-386-70",
+		machineType:        "n1-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. n1-highcpu host.",
+		SSHUsername:        "gopher",
+	},
 	"host-openbsd-arm-joelsing": &HostConfig{
 		IsReverse: true,
 		ExpectNum: 1,
@@ -334,6 +350,14 @@ var Hosts = map[string]*HostConfig{
 		goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-netbsd-amd64-2da6b33.tar.gz",
 		SSHUsername:        "root",
 	},
+	"host-netbsd-amd64-9_0-n1": &HostConfig{
+		VMImage:            "netbsd-amd64-9-0-2019q4",
+		Notes:              "NetBSD 9.0; GCE VM is built from script in build/env/netbsd-amd64. n1-highcpu host.",
+		machineType:        "n1-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",
@@ -342,6 +366,14 @@ var Hosts = map[string]*HostConfig{
 		goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-netbsd-386-0b3b511.tar.gz",
 		SSHUsername:        "root",
 	},
+	"host-netbsd-386-9_0-n1": &HostConfig{
+		VMImage:            "netbsd-i386-9-0-2019q4",
+		Notes:              "NetBSD 9.0; GCE VM is built from script in build/env/netbsd-386. n1-highcpu host.",
+		machineType:        "n1-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,
@@ -1972,6 +2004,13 @@ func init() {
 		distTestAdjust:    noTestDirAndNoReboot,
 		numTryTestHelpers: 4,
 	})
+	addBuilder(BuildConfig{
+		Name:              "openbsd-amd64-70-n1",
+		HostType:          "host-openbsd-amd64-70-n1",
+		tryBot:            defaultTrySet(),
+		distTestAdjust:    noTestDirAndNoReboot,
+		numTryTestHelpers: 4,
+	})
 	addBuilder(BuildConfig{
 		Name:     "openbsd-386-70",
 		HostType: "host-openbsd-386-70",
@@ -1987,6 +2026,21 @@ func init() {
 		distTestAdjust:    noTestDirAndNoReboot,
 		numTryTestHelpers: 4,
 	})
+	addBuilder(BuildConfig{
+		Name:     "openbsd-386-70-n1",
+		HostType: "host-openbsd-386-70-n1",
+		tryBot:   explicitTrySet("sys"),
+		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
+			}
+			return buildRepoByDefault(repo)
+		},
+		distTestAdjust:    noTestDirAndNoReboot,
+		numTryTestHelpers: 4,
+	})
 	addBuilder(BuildConfig{
 		Name:         "openbsd-arm-jsing",
 		HostType:     "host-openbsd-arm-joelsing",
@@ -2050,11 +2104,22 @@ func init() {
 		distTestAdjust: noTestDirAndNoReboot,
 		tryBot:         explicitTrySet("sys"),
 	})
+	addBuilder(BuildConfig{
+		Name:           "netbsd-amd64-9_0-n1",
+		HostType:       "host-netbsd-amd64-9_0-n1",
+		distTestAdjust: noTestDirAndNoReboot,
+		tryBot:         explicitTrySet("sys"),
+	})
 	addBuilder(BuildConfig{
 		Name:           "netbsd-386-9_0",
 		HostType:       "host-netbsd-386-9_0",
 		distTestAdjust: noTestDirAndNoReboot,
 	})
+	addBuilder(BuildConfig{
+		Name:           "netbsd-386-9_0-n1",
+		HostType:       "host-netbsd-386-9_0-n1",
+		distTestAdjust: noTestDirAndNoReboot,
+	})
 	addBuilder(BuildConfig{
 		Name:     "netbsd-arm-bsiegert",
 		HostType: "host-netbsd-arm-bsiegert",

diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go
@@ -102,6 +102,7 @@ func TestTrybots(t *testing.T) {
 				"linux-arm64-aws",
 				"openbsd-amd64-68",
 				"openbsd-amd64-70",
+				"openbsd-amd64-70-n1",
 				"windows-386-2012",
 				"windows-amd64-2016",
 
@@ -135,6 +136,7 @@ func TestTrybots(t *testing.T) {
 				"linux-arm64-aws",
 				"openbsd-amd64-68",
 				"openbsd-amd64-70",
+				"openbsd-amd64-70-n1",
 				"windows-386-2012",
 				"windows-amd64-2016",
 
@@ -167,6 +169,7 @@ func TestTrybots(t *testing.T) {
 				"linux-arm64-aws",
 				"openbsd-amd64-68",
 				"openbsd-amd64-70",
+				"openbsd-amd64-70-n1",
 				"windows-386-2008",
 				"windows-amd64-2016",
 
@@ -204,6 +207,7 @@ func TestTrybots(t *testing.T) {
 				"linux-arm64-aws",
 				"openbsd-amd64-68",
 				"openbsd-amd64-70",
+				"openbsd-amd64-70-n1",
 				"windows-386-2008",
 				"windows-amd64-2016",
 
@@ -250,10 +254,13 @@ func TestTrybots(t *testing.T) {
 				"linux-arm-aws",
 				"linux-arm64-aws",
 				"netbsd-amd64-9_0",
+				"netbsd-amd64-9_0-n1",
 				"openbsd-386-68",
 				"openbsd-386-70",
+				"openbsd-386-70-n1",
 				"openbsd-amd64-68",
 				"openbsd-amd64-70",
+				"openbsd-amd64-70-n1",
 				"windows-386-2012",
 				"windows-amd64-2016",
 			},