From 4389c98f9c9b17e4565f1c1b7b3a6de6140eb522 Mon Sep 17 00:00:00 2001 From: Alex Rakoczy Date: Wed, 3 Aug 2022 15:24:34 -0400 Subject: [PATCH] cmd/coodinator,dashboard: remove toothrot mac builders They have been superseded in CL 406021. Change-Id: I39c00db6f1237eaaf69885f96cf6fb446829a300 Reviewed-on: https://go-review.googlesource.com/c/build/+/420802 Auto-Submit: Jenny Rakoczy TryBot-Result: Gopher Robot Reviewed-by: Dmitri Shuralyov Reviewed-by: Dmitri Shuralyov Run-TryBot: Jenny Rakoczy --- cmd/coordinator/status.go | 2 +- dashboard/builders.go | 30 ------------------------------ 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/cmd/coordinator/status.go b/cmd/coordinator/status.go index 9dc86481..86d09ecf 100644 --- a/cmd/coordinator/status.go +++ b/cmd/coordinator/status.go @@ -372,7 +372,7 @@ func fetchMakeMacStatus() (errs, warns []string) { func newMacOSARM64Checker() *healthChecker { var expect int // Number of expected darwin/arm64 reverse builders based on x/build/dashboard. for hostType, hc := range dashboard.Hosts { - if !strings.HasPrefix(hostType, "host-darwin-arm64-") || strings.Contains(hostType, "toothrot") || !hc.IsReverse { + if !strings.HasPrefix(hostType, "host-darwin-arm64-") || !hc.IsReverse { continue } expect += hc.ExpectNum diff --git a/dashboard/builders.go b/dashboard/builders.go index 0c5d98c2..a80bd135 100644 --- a/dashboard/builders.go +++ b/dashboard/builders.go @@ -191,15 +191,6 @@ var Hosts = map[string]*HostConfig{ }, SSHUsername: "gopher", }, - "host-darwin-arm64-11_0-toothrot": { - IsReverse: true, - Notes: "macOS Big Sur (11) ARM64 (M1). Mac mini", - ExpectNum: 1, - env: []string{ - "GOROOT_BOOTSTRAP=/Users/gopher/goboot", - }, - SSHUsername: "gopher", - }, "host-darwin-arm64-12": { IsReverse: true, ExpectNum: 3, @@ -209,15 +200,6 @@ var Hosts = map[string]*HostConfig{ }, SSHUsername: "gopher", }, - "host-darwin-arm64-12_0-toothrot": { - IsReverse: true, - ExpectNum: 1, - Notes: "macOS Big Sur (12) ARM64 (M1). Mac mini", - env: []string{ - "GOROOT_BOOTSTRAP=/Users/gopher/goboot", - }, - SSHUsername: "gopher", - }, "host-dragonfly-amd64-622": { Notes: "DragonFly BSD 6.2.2 on GCE, built from build/env/dragonfly-amd64", VMImage: "dragonfly-amd64-622", @@ -2398,18 +2380,6 @@ func init() { distTestAdjust: noTestDirAndNoReboot, env: []string{"CGO_ENABLED=0"}, }) - addBuilder(BuildConfig{ - Name: "darwin-arm64-11_0-toothrot", - HostType: "host-darwin-arm64-11_0-toothrot", - distTestAdjust: macTestPolicy, - buildsRepo: defaultPlusExpBuild, - }) - addBuilder(BuildConfig{ - Name: "darwin-arm64-12_0-toothrot", - HostType: "host-darwin-arm64-12_0-toothrot", - distTestAdjust: macTestPolicy, - buildsRepo: defaultPlusExpBuild, - }) addBuilder(BuildConfig{ Name: "darwin-arm64-11", HostType: "host-darwin-arm64-11",