dashboard, cmd/coordinator: remove Joyent builders

Joyent.com is shutting down their public cloud, so we no longer
have our GOOS=solaris or GOOS=illumos builders there.

Maybe somebody will find a new place to run them. Or maybe the ports
will be abandoned. We'll see.

Updates golang/go#15581

Change-Id: I0590227ce61b6b298b6aa4554e5e3bc9e4c464b5
Reviewed-on: https://go-review.googlesource.com/c/build/+/200219
Reviewed-by: Dmitri Shuralyov <[email protected]>

cmd/buildlet/buildlet.go

@@ -144,13 +144,6 @@ func main() {
 		startAndroidEmulator()
 	}
 
-	if *reverse == "solaris-amd64-smartosbuildlet" {
-		// These machines were setup without GO_BUILDER_ENV
-		// set in their base image, so do init work here after
-		// flag parsing instead of at top.
-		*rebootOnHalt = true
-	}
-
 	// Optimize emphemeral filesystems. Prefer speed over safety,
 	// since these VMs only last for the duration of one build.
 	switch runtime.GOOS {
@@ -269,21 +262,6 @@ func initGorootBootstrap() {
 	// Default if not otherwise configured in dashboard/builders.go:
 	os.Setenv("GOROOT_BOOTSTRAP", filepath.Join(*workDir, "go1.4"))
 
-	if runtime.GOOS == "solaris" && runtime.GOARCH == "amd64" {
-		gbenv := os.Getenv("GO_BUILDER_ENV")
-		if strings.Contains(gbenv, "oracle") {
-			// Oracle Solaris; not OpenSolaris-based or
-			// Illumos-based.  Do nothing.
-			return
-		}
-
-		// Assume this is an OpenSolaris-based machine or a
-		// SmartOS/Illumos machine before GOOS=="illumos" split.  For
-		// these machines, the old Joyent builders need to get the
-		// bootstrap and some config fixed.
-		os.Setenv("PATH", os.Getenv("PATH")+":/opt/local/bin")
-		downloadBootstrapGoroot("/root/go-solaris-amd64-bootstrap", "https://storage.googleapis.com/go-builder-data/gobootstrap-solaris-amd64.tar.gz")
-	}
 	if runtime.GOOS == "linux" && runtime.GOARCH == "ppc64" {
 		downloadBootstrapGoroot("/usr/local/go-bootstrap", "https://storage.googleapis.com/go-builder-data/gobootstrap-linux-ppc64.tar.gz")
 	}

cmd/buildlet/stage0/stage0.go

@@ -195,17 +195,8 @@ Download:
 		// Assume OSU (osuosl.org) host type for now. If we get more, use
 		// GO_BUILD_HOST_TYPE (see above) and check that.
 		cmd.Args = append(cmd.Args, reverseHostTypeArgs("host-linux-ppc64le-osu")...)
-	case "solaris/amd64":
-		hostType := buildEnv
-		if hostType == "" {
-			hostType = "host-solaris-amd64"
-		}
-		cmd.Args = append(cmd.Args, reverseHostTypeArgs(hostType)...)
-	case "illumos/amd64":
+	case "solaris/amd64", "illumos/amd64":
 		hostType := buildEnv
-		if hostType == "" {
-			hostType = "host-illumos-amd64-joyent"
-		}
 		cmd.Args = append(cmd.Args, reverseHostTypeArgs(hostType)...)
 	}
 	// Release the serial port (if we opened it) so the buildlet

cmd/coordinator/status.go

@@ -141,8 +141,6 @@ func addHealthCheckers(ctx context.Context) {
 	addHealthChecker(newPacketHealthChecker())
 	addHealthChecker(newOSUPPC64Checker())
 	addHealthChecker(newOSUPPC64leChecker())
-	addHealthChecker(newJoyentSolarisChecker())
-	addHealthChecker(newJoyentIllumosChecker())
 	addHealthChecker(newBasepinChecker())
 	addHealthChecker(newGitMirrorChecker())
 	addHealthChecker(newTipGolangOrgChecker(ctx))
@@ -371,24 +369,6 @@ func fetchMakeMacStatus() (errs, warns []string) {
 	return resj.Errors, resj.Warnings
 }
 
-func newJoyentSolarisChecker() *healthChecker {
-	return &healthChecker{
-		ID:     "joyent-solaris",
-		Title:  "Joyent solaris/amd64 machines",
-		DocURL: "https://github.com/golang/build/tree/master/env/solaris-amd64/joyent",
-		Check:  hostTypeChecker("host-solaris-amd64"),
-	}
-}
-
-func newJoyentIllumosChecker() *healthChecker {
-	return &healthChecker{
-		ID:     "joyent-illumos",
-		Title:  "Joyent illumos/amd64 machines",
-		DocURL: "https://github.com/golang/build/tree/master/env/illumos-amd64-joyent",
-		Check:  hostTypeChecker("host-illumos-amd64-joyent"),
-	}
-}
-
 func hostTypeChecker(hostType string) func(cw *checkWriter) {
 	want := expectedHosts(hostType)
 	return func(cw *checkWriter) {

dashboard/builders.go

@@ -441,23 +441,6 @@ var Hosts = map[string]*HostConfig{
 		env:             []string{"GOROOT_BOOTSTRAP=/usr/local/go-bootstrap"},
 		SSHUsername:     "root",
 	},
-	"host-solaris-amd64": &HostConfig{
-		Notes:          "run by Go team on Joyent, on a SmartOS 'infrastructure container'",
-		IsReverse:      true,
-		ExpectNum:      5,
-		env:            []string{"GOROOT_BOOTSTRAP=/root/go-solaris-amd64-bootstrap", "HOME=/root"},
-		ReverseAliases: []string{"solaris-amd64-smartosbuildlet"},
-	},
-	"host-illumos-amd64-joyent": &HostConfig{
-		Notes:     "run by Go team on Joyent, on a SmartOS 'infrastructure container'",
-		IsReverse: true,
-		ExpectNum: 1,
-		env: []string{
-			"GOROOT_BOOTSTRAP=/root/goboot",
-			"HOME=/root",
-			"PATH=/usr/sbin:/usr/bin:/opt/local/bin", // gcc is in /opt/local/bin
-		},
-	},
 	"host-solaris-oracle-amd64-oraclerel": &HostConfig{
 		Notes:       "Oracle Solaris amd64 Release System",
 		Owner:       "", // TODO: find current owner
@@ -2040,24 +2023,6 @@ func init() {
 		HostType: "host-solaris-oracle-amd64-oraclerel",
 		Notes:    "Oracle Solaris release version",
 	})
-	addBuilder(BuildConfig{
-		Name:     "solaris-amd64-smartosbuildlet",
-		HostType: "host-solaris-amd64",
-	})
-	addBuilder(BuildConfig{
-		Name:             "illumos-amd64-joyent",
-		HostType:         "host-illumos-amd64-joyent",
-		MinimumGoVersion: types.MajorMinor{1, 13},
-		buildsRepo: func(repo, branch, goBranch string) bool {
-			if repo == "review" {
-				// '.git/hooks/pre-commit' cannot be executed on this builder,
-				// which causes the x/review tests to fail.
-				// (https://golang.org/issue/32836)
-				return false
-			}
-			return defaultBuildsRepoPolicy(repo, branch, goBranch)
-		},
-	})
 	addBuilder(BuildConfig{
 		Name:     "linux-ppc64-buildlet",
 		HostType: "host-linux-ppc64-osu",
@@ -2304,7 +2269,9 @@ func atLeastGo1(branch string, min int) bool {
 func onlyGo(repo, branch, goBranch string) bool { return repo == "go" }
 
 // onlyMaster is a common buildsRepo policy value that only builds things on the master branch.
-func onlyMaster(repo, branch, goBranch string) bool { return branch == "master" && goBranch == "master" }
+func onlyMaster(repo, branch, goBranch string) bool {
+	return branch == "master" && goBranch == "master"
+}
 
 // disabledBuilder is a buildsRepo policy function that always return false.
 func disabledBuilder(repo, branch, goBranch string) bool { return false }

dashboard/builders_test.go

@@ -368,16 +368,6 @@ func TestBuilderConfig(t *testing.T) {
 		{b("[email protected]", "net"), none},
 		{b("[email protected]", "mobile"), none},
 
-		// Illumos starts at Go 1.13
-		{b("illumos-amd64-joyent", "go"), onlyPost},
-		{b("illumos-amd64-joyent", "net"), onlyPost},
-		{b("illumos-amd64-joyent", "sys"), onlyPost},
-		{b("[email protected]", "go"), onlyPost},
-		{b("[email protected]", "go"), none},
-		{b("[email protected]", "sys"), none},
-		{b("[email protected]", "go"), none},
-		{b("[email protected]", "sys"), none},
-
 		{b("linux-amd64-nocgo", "mobile"), none},
 
 		// Virtual mobiledevices