Skip to content

Commit d3596bf

Browse files
committed
dashboard, cmd/coordinator: remove all Scaleway builders
Remove all builders hosted on Scaleway. This change also removes the Scaleway coordinator health checks. Fixes golang/go#22749 Updates golang/go#45066 Change-Id: If43fe7f971a2bd969fd7e5f98b4d945e610179e9 Reviewed-on: https://go-review.googlesource.com/c/build/+/325694 Trust: Carlos Amedee <[email protected]> Run-TryBot: Carlos Amedee <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Heschi Kreinick <[email protected]> Reviewed-by: Alexander Rakoczy <[email protected]>
1 parent 1a31fad commit d3596bf

File tree

4 files changed

+0
-58
lines changed

4 files changed

+0
-58
lines changed

cmd/coordinator/coordinator.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1917,10 +1917,6 @@ func (st *buildStatus) expectedBuildletStartDuration() time.Duration {
19171917
// return 1 * time.Minute // VMware boot of hermetic OS X
19181918
}
19191919
}
1920-
if goos == "linux" && arch == "arm" {
1921-
// Scaleway. Ready or not.
1922-
return 0
1923-
}
19241920
}
19251921
return 0
19261922
}

cmd/coordinator/status.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ var basePinErr atomic.Value
147147
func addHealthCheckers(ctx context.Context, sc *secret.Client) {
148148
addHealthChecker(newMacHealthChecker())
149149
addHealthChecker(newMacOSARM64Checker())
150-
addHealthChecker(newScalewayHealthChecker())
151150
addHealthChecker(newPacketHealthChecker())
152151
addHealthChecker(newOSUPPC64Checker())
153152
addHealthChecker(newOSUPPC64leChecker())
@@ -460,20 +459,6 @@ func expectedHosts(hostType string) int {
460459
return hc.ExpectNum
461460
}
462461

463-
func newScalewayHealthChecker() *healthChecker {
464-
var hosts []string
465-
for i := 1; i <= expectedHosts("host-linux-arm-scaleway"); i++ {
466-
name := fmt.Sprintf("scaleway-prod-%02d", i)
467-
hosts = append(hosts, name)
468-
}
469-
return &healthChecker{
470-
ID: "scaleway",
471-
Title: "Scaleway linux/arm machines",
472-
DocURL: "https://github.com/golang/build/tree/master/env/linux-arm/scaleway",
473-
Check: reverseHostChecker(hosts),
474-
}
475-
}
476-
477462
func newPacketHealthChecker() *healthChecker {
478463
var hosts []string
479464
for i := 1; i <= expectedHosts("host-linux-arm64-packet"); i++ {

cmd/coordinator/status_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ func TestHandleStatus_HealthFormatting(t *testing.T) {
9191
}
9292
for _, sub := range []string{
9393
`<a href="/status/macs">MacStadium Mac VMs</a> [`,
94-
`<a href="/status/scaleway">Scaleway linux/arm machines</a> [`,
95-
`<li>scaleway-prod-02 not yet connected</li>`,
9694
`<li>macstadium_host06a not yet connected</li>`,
9795
`<a href="/status/allgood">All Good Test</a>: ok`,
9896
`<li>test-info</li>`,

dashboard/builders.go

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -205,13 +205,6 @@ var Hosts = map[string]*HostConfig{
205205
env: []string{"GOROOT_BOOTSTRAP=/goboot"},
206206
SSHUsername: "root",
207207
},
208-
"host-linux-arm-scaleway": &HostConfig{
209-
IsReverse: true,
210-
HermeticReverse: true,
211-
ExpectNum: 50,
212-
env: []string{"GOROOT_BOOTSTRAP=/usr/local/go"},
213-
SSHUsername: "root",
214-
},
215208
"host-linux-arm5spacemonkey": &HostConfig{
216209
IsReverse: true,
217210
ExpectNum: 3,
@@ -1960,36 +1953,6 @@ func init() {
19601953
},
19611954
numTryTestHelpers: 4, // Target time is < 15 min for golang.org/issue/42661.
19621955
})
1963-
addBuilder(BuildConfig{
1964-
Name: "linux-arm-scaleway",
1965-
HostType: "host-linux-arm-scaleway",
1966-
CrossCompileConfig: &CrossCompileConfig{
1967-
CompileHostType: "host-linux-armhf-cross",
1968-
CCForTarget: "arm-linux-gnueabihf-gcc",
1969-
GOARM: "7",
1970-
AlwaysCrossCompile: false,
1971-
},
1972-
tryBot: nil, // Issues #22748, #22749, #35628, #40872.
1973-
KnownIssue: 35628,
1974-
FlakyNet: true,
1975-
numTestHelpers: 2,
1976-
numTryTestHelpers: 7,
1977-
distTestAdjust: func(run bool, distTest string, isNormalTry bool) bool {
1978-
switch distTest {
1979-
case "api", "reboot":
1980-
return false
1981-
}
1982-
return run
1983-
},
1984-
})
1985-
addBuilder(BuildConfig{
1986-
Name: "linux-arm-nativemake",
1987-
Notes: "runs make.bash on real ARM hardware, but does not run tests",
1988-
HostType: "host-linux-arm-scaleway",
1989-
tryOnly: true,
1990-
tryBot: nil,
1991-
StopAfterMake: true,
1992-
})
19931956
addBuilder(BuildConfig{
19941957
Name: "linux-arm-arm5spacemonkey",
19951958
HostType: "host-linux-arm5spacemonkey",

0 commit comments

Comments
 (0)