dashboard: clean up builders affected by memory corruption

Remove freebsd 12.2, which is replaced by 12.3 with the XSAVE fix. Move freebsd 11.* to N2 machines, which are not affected. Remove openbsd and netbsd e2/n1/n2/n2d-specific configurations now that we have mostly understood the nature of that problem. Keep one around so that the runtime team can create gomotes. Move the "official" builder to the n2 cpu that works. For golang/go#49967, golang/go#49209, golang/go#40561. Fixes golang/go#50496. Change-Id: If6989317f06cbec95d5addb19d9e968aecfa3f8a Reviewed-on: https://go-review.googlesource.com/c/build/+/377474 Trust: Heschi Kreinick <heschi@google.com> Run-TryBot: Heschi Kreinick <heschi@google.com> Reviewed-by: Carlos Amedee <carlos@golang.org> Reviewed-by: Alex Rakoczy <alex@golang.org> Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org> TryBot-Result: Gopher Robot <gobot@golang.org>
golang · Jan 12, 2022 · 1446634 · 1446634
1 parent 1d9ebe8
commit 1446634
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 249 deletions.
diff --git a/cmd/release/release.go b/cmd/release/release.go
@@ -177,14 +177,14 @@ var builds = []*Build{
 		GoQuery: ">= go1.18beta1", // See #40561.
 		OS:      "freebsd",
 		Arch:    "386",
-		Builder: "freebsd-386-12_2",
+		Builder: "freebsd-386-12_3",
 	},
 	{
 		GoQuery: ">= go1.18beta1", // See #40561.
 		OS:      "freebsd",
 		Arch:    "amd64",
 		Race:    true,
-		Builder: "freebsd-amd64-12_2",
+		Builder: "freebsd-amd64-12_3",
 	},
 	{
 		GoQuery: ">= go1.17beta1 && < go1.18beta1", // See #45727.

diff --git a/cmd/release/release_test.go b/cmd/release/release_test.go
@@ -115,9 +115,9 @@ func TestBuilderSelectionPerGoVersion(t *testing.T) {
 		{"go1.17rc2", "freebsd-386", "freebsd-386-11_4"},
 		{"go1.17", "freebsd-amd64", "freebsd-amd64-11_4"},
 		{"go1.17", "freebsd-386", "freebsd-386-11_4"},
-		// Go 1.18 use the the FreeBSD 12.2 builder.
-		{"go1.18", "freebsd-amd64", "freebsd-amd64-12_2"},
-		{"go1.18", "freebsd-386", "freebsd-386-12_2"},
+		// Go 1.18 use the the FreeBSD 12.3 builder.
+		{"go1.18", "freebsd-amd64", "freebsd-amd64-12_3"},
+		{"go1.18", "freebsd-386", "freebsd-386-12_3"},
 
 		// macOS (amd64)
 		// Go 1.16 uses MacOS 10.15.

diff --git a/dashboard/builders.go b/dashboard/builders.go
@@ -231,69 +231,29 @@ var Hosts = map[string]*HostConfig{
 	},
 	"host-openbsd-amd64-68": &HostConfig{
 		VMImage:            "openbsd-amd64-68-v3", // v3 adds 009_exit syspatch; see golang.org/cl/278732.
-		machineType:        "e2-highcpu-4",
+		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 6.8 (with 009_exit syspatch); GCE VM is built from script in build/env/openbsd-amd64",
 		SSHUsername:        "gopher",
 	},
 	"host-openbsd-386-68": &HostConfig{
 		VMImage:            "openbsd-386-68-v3", // v3 adds 009_exit syspatch; see golang.org/cl/278732.
-		machineType:        "e2-highcpu-4",
+		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 6.8 (with 009_exit syspatch); GCE VM is built from script in build/env/openbsd-386",
 		SSHUsername:        "gopher",
 	},
 	"host-openbsd-amd64-70": &HostConfig{
-		VMImage:            "openbsd-amd64-70",
-		machineType:        "e2-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",
-		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-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",
-		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",
-		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-386-70-n2": &HostConfig{
 		VMImage:            "openbsd-386-70",
 		machineType:        "n2-highcpu-4",
 		buildletURLTmpl:    "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-386",
@@ -302,6 +262,7 @@ var Hosts = map[string]*HostConfig{
 		SSHUsername:        "gopher",
 	},
 	"host-openbsd-386-70-n2d": &HostConfig{
+		// This host config is only for the runtime team to use investigating golang/go#49209.
 		VMImage:            "openbsd-386-70",
 		machineType:        "n2d-highcpu-4",
 		buildletURLTmpl:    "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-386",
@@ -330,23 +291,15 @@ var Hosts = map[string]*HostConfig{
 	"host-freebsd-11_2": &HostConfig{
 		VMImage:            "freebsd-amd64-112",
 		Notes:              "FreeBSD 11.2; GCE VM is built from script in build/env/freebsd-amd64",
-		machineType:        "e2-highcpu-4",
+		machineType:        "n2-highcpu-4",
 		buildletURLTmpl:    "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64",
 		goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
 		SSHUsername:        "gopher",
 	},
 	"host-freebsd-11_4": &HostConfig{
 		VMImage:            "freebsd-amd64-114",
 		Notes:              "FreeBSD 11.4; GCE VM is built from script in build/env/freebsd-amd64",
-		machineType:        "e2-highcpu-4",
-		buildletURLTmpl:    "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64",
-		goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
-		SSHUsername:        "gopher",
-	},
-	"host-freebsd-12_2": &HostConfig{
-		VMImage:            "freebsd-amd64-122",
-		Notes:              "FreeBSD 12.2; GCE VM is built from script in build/env/freebsd-amd64",
-		machineType:        "e2-highcpu-4",
+		machineType:        "n2-highcpu-4",
 		buildletURLTmpl:    "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64",
 		goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
 		SSHUsername:        "gopher",
@@ -376,69 +329,21 @@ var Hosts = map[string]*HostConfig{
 		SSHUsername:        "gopher",
 	},
 	"host-netbsd-amd64-9_0": &HostConfig{
-		VMImage:            "netbsd-amd64-9-0-2019q4",
-		Notes:              "NetBSD 9.0; GCE VM is built from script in build/env/netbsd-amd64",
-		machineType:        "e2-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-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-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",
-		machineType:        "e2-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-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-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,
@@ -1590,14 +1495,6 @@ func init() {
 			return atMostGo1(goBranch, 17) && buildRepoByDefault(repo)
 		},
 	})
-	addBuilder(BuildConfig{
-		Name:     "freebsd-amd64-12_2",
-		HostType: "host-freebsd-12_2",
-		tryBot:   defaultTrySet("sys"),
-
-		distTestAdjust:    fasterTrybots, // If changing this policy, update TestShouldRunDistTest accordingly.
-		numTryTestHelpers: 4,
-	})
 	addBuilder(BuildConfig{
 		Name:     "freebsd-amd64-12_3",
 		HostType: "host-freebsd-12_3",
@@ -1606,13 +1503,6 @@ func init() {
 		distTestAdjust:    fasterTrybots, // If changing this policy, update TestShouldRunDistTest accordingly.
 		numTryTestHelpers: 4,
 	})
-	addBuilder(BuildConfig{
-		Name:              "freebsd-386-12_2",
-		HostType:          "host-freebsd-12_2",
-		env:               []string{"GOARCH=386", "GOHOSTARCH=386"},
-		distTestAdjust:    fasterTrybots,
-		numTryTestHelpers: 4,
-	})
 	addBuilder(BuildConfig{
 		Name:              "freebsd-386-12_3",
 		HostType:          "host-freebsd-12_3",
@@ -2120,38 +2010,6 @@ func init() {
 		},
 		numTryTestHelpers: 4,
 	})
-	addBuilder(BuildConfig{
-		Name:           "openbsd-amd64-70-n1",
-		HostType:       "host-openbsd-amd64-70-n1",
-		tryBot:         defaultTrySet(),
-		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)
-		},
-		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",
@@ -2170,50 +2028,10 @@ func init() {
 		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
-			}
-			// 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,
-		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)
-		},
+		// This builder is only for the runtime team to use investigating golang/go#49209.
+		Name:           "openbsd-386-70-n2d",
+		HostType:       "host-openbsd-386-70-n2d",
+		buildsRepo:     disabledBuilder,
 		distTestAdjust: noTestDirAndNoReboot,
 	})
 	addBuilder(BuildConfig{
@@ -2282,42 +2100,11 @@ 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-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,
 	})
-	addBuilder(BuildConfig{
-		Name:           "netbsd-386-9_0-n1",
-		HostType:       "host-netbsd-386-9_0-n1",
-		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",