From 4ff362bb67ae2db336aab94ab2c2095e7ab136e6 Mon Sep 17 00:00:00 2001 From: Guoqi Chen Date: Tue, 14 May 2024 19:24:12 +0800 Subject: [PATCH] dashboard: stop linux-loong64 builders All linux/loong64 builders have been ported. Updates golang/go#63471 Change-Id: Ic60654595c173ac9d869827bdcaac134b5454889 Reviewed-on: https://go-review.googlesource.com/c/build/+/585295 Reviewed-by: Dmitri Shuralyov Reviewed-by: Cherry Mui Auto-Submit: Dmitri Shuralyov LUCI-TryBot-Result: Go LUCI Run-TryBot: abner chenc TryBot-Result: Gopher Robot Reviewed-by: Dmitri Shuralyov --- dashboard/builders.go | 18 +++++++++++++++--- dashboard/builders_test.go | 11 ++++++----- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dashboard/builders.go b/dashboard/builders.go index 073f29e6c1..3886055da3 100644 --- a/dashboard/builders.go +++ b/dashboard/builders.go @@ -44,6 +44,8 @@ var slowBotAliases = map[string]string{ "linux-ppc64le": "", "linux-ppc64le-power9": "", "linux-ppc64le-power10": "", + "loong64": "", + "linux-loong64": "", "386": "linux-386", "aix": "aix-ppc64", @@ -72,7 +74,6 @@ var slowBotAliases = map[string]string{ "ios": "ios-arm64-corellium", "linux": "linux-amd64", "linux-arm": "linux-arm-aws", - "linux-loong64": "linux-loong64-3a5000", "linux-mips": "linux-mips-rtrk", "linux-mips64": "linux-mips64-rtrk", "linux-mips64le": "linux-mips64le-rtrk", @@ -80,7 +81,6 @@ var slowBotAliases = map[string]string{ "linux-riscv64": "linux-riscv64-unmatched", "linux-s390x": "linux-s390x-ibm", "longtest": "linux-amd64-longtest", - "loong64": "linux-loong64-3a5000", "mips": "linux-mips-rtrk", "mips64": "linux-mips64-rtrk", "mips64le": "linux-mips64le-rtrk", @@ -2937,7 +2937,19 @@ var BuildersPortedToLUCI = map[string]bool{ // stopPortedBuilder reports whether the named ported builder should be stopped, // instead of just made invisible in the web UI. func stopPortedBuilder(builderName string) (stop bool) { - return strings.Contains(builderName, "-wasm-") || strings.Contains(builderName, "linux-ppc64") + nameKeyList := []string{ + "linux-loong64", + "linux-ppc64", + "-wasm-", + } + + for _, key := range nameKeyList { + if strings.Contains(builderName, key) { + return true + } + } + + return false } // addBuilder adds c to the Builders map after doing some checks. diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go index dccf21f983..3562395b7a 100644 --- a/dashboard/builders_test.go +++ b/dashboard/builders_test.go @@ -518,11 +518,12 @@ func TestBuilderConfig(t *testing.T) { {b("linux-amd64", "net"), both}, - {b("linux-loong64-3a5000", "go"), onlyPost}, - {b("linux-loong64-3a5000@go1.99", "go"), onlyPost}, - {b("linux-loong64-3a5000", "sys"), onlyPost}, - {b("linux-loong64-3a5000@go1.99", "sys"), onlyPost}, - {b("linux-loong64-3a5000", "net"), onlyPost}, + // Builders for linux/loong64 are fully ported to LUCI and stopped in the coordinator. + {b("linux-loong64-3a5000", "go"), none}, + {b("linux-loong64-3a5000@go1.99", "go"), none}, + {b("linux-loong64-3a5000", "sys"), none}, + {b("linux-loong64-3a5000@go1.99", "sys"), none}, + {b("linux-loong64-3a5000", "net"), none}, // OpenBSD 7.2. {b("openbsd-amd64-72", "go"), both},