Skip to content

Commit 5368811

Browse files
dmitshurgopherbot
authored andcommitted
dashboard: stop running macOS builders
All of them have been ported to LUCI. Stop running the previous ones and disable their health check. For golang/go#67761. Change-Id: I1128322aa216341641878c785773339bffcf799e Reviewed-on: https://go-review.googlesource.com/c/build/+/589659 Reviewed-by: Michael Pratt <[email protected]> Auto-Submit: Dmitri Shuralyov <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent 6fefa43 commit 5368811

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

cmd/coordinator/status.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ func addHealthChecker(mux *http.ServeMux, hc *healthChecker) {
144144
var basePinErr atomic.Value
145145

146146
func addHealthCheckers(ctx context.Context, mux *http.ServeMux, sc *secret.Client) {
147-
addHealthChecker(mux, newMacOSARM64Checker())
148147
addHealthChecker(mux, newBasepinChecker())
149148
addHealthChecker(mux, newGitMirrorChecker())
150149
addHealthChecker(mux, newGitHubAPIChecker(ctx, sc))

dashboard/builders_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,11 @@ func TestBuilderConfig(t *testing.T) {
657657
}
658658
gotPost := bc.BuildsRepoPostSubmit(tt.br.repo, tt.br.branch, tt.br.goBranch)
659659
if tt.want&isBuilder != 0 && !gotPost {
660-
t.Errorf("not a post-submit builder, but expected")
660+
if stopped := migration.BuildersPortedToLUCI[bc.Name] && migration.StopPortedBuilder(bc.Name); stopped {
661+
t.Logf("not a post-submit builder because it's intentionally stopped")
662+
} else {
663+
t.Errorf("not a post-submit builder, but expected")
664+
}
661665
}
662666
if tt.want&notBuilder != 0 && gotPost {
663667
t.Errorf("unexpectedly a post-submit builder")

internal/migration/migration.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ var BuildersPortedToLUCI = map[string]bool{
9090
// instead of just made invisible in the web UI.
9191
func StopPortedBuilder(builderName string) (stop bool) {
9292
nameKeyList := []string{
93+
"darwin-",
9394
"linux-loong64",
9495
"linux-ppc64",
9596
"-wasm-",

0 commit comments

Comments
 (0)