зеркало из https://github.com/golang/build.git
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 <carlos@golang.org> Run-TryBot: Carlos Amedee <carlos@golang.org> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Heschi Kreinick <heschi@google.com> Reviewed-by: Alexander Rakoczy <alex@golang.org>
This commit is contained in:
Родитель
1a31fad2a2
Коммит
d3596bf599
|
@ -1917,10 +1917,6 @@ func (st *buildStatus) expectedBuildletStartDuration() time.Duration {
|
||||||
// return 1 * time.Minute // VMware boot of hermetic OS X
|
// return 1 * time.Minute // VMware boot of hermetic OS X
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if goos == "linux" && arch == "arm" {
|
|
||||||
// Scaleway. Ready or not.
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
|
@ -147,7 +147,6 @@ var basePinErr atomic.Value
|
||||||
func addHealthCheckers(ctx context.Context, sc *secret.Client) {
|
func addHealthCheckers(ctx context.Context, sc *secret.Client) {
|
||||||
addHealthChecker(newMacHealthChecker())
|
addHealthChecker(newMacHealthChecker())
|
||||||
addHealthChecker(newMacOSARM64Checker())
|
addHealthChecker(newMacOSARM64Checker())
|
||||||
addHealthChecker(newScalewayHealthChecker())
|
|
||||||
addHealthChecker(newPacketHealthChecker())
|
addHealthChecker(newPacketHealthChecker())
|
||||||
addHealthChecker(newOSUPPC64Checker())
|
addHealthChecker(newOSUPPC64Checker())
|
||||||
addHealthChecker(newOSUPPC64leChecker())
|
addHealthChecker(newOSUPPC64leChecker())
|
||||||
|
@ -460,20 +459,6 @@ func expectedHosts(hostType string) int {
|
||||||
return hc.ExpectNum
|
return hc.ExpectNum
|
||||||
}
|
}
|
||||||
|
|
||||||
func newScalewayHealthChecker() *healthChecker {
|
|
||||||
var hosts []string
|
|
||||||
for i := 1; i <= expectedHosts("host-linux-arm-scaleway"); i++ {
|
|
||||||
name := fmt.Sprintf("scaleway-prod-%02d", i)
|
|
||||||
hosts = append(hosts, name)
|
|
||||||
}
|
|
||||||
return &healthChecker{
|
|
||||||
ID: "scaleway",
|
|
||||||
Title: "Scaleway linux/arm machines",
|
|
||||||
DocURL: "https://github.com/golang/build/tree/master/env/linux-arm/scaleway",
|
|
||||||
Check: reverseHostChecker(hosts),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func newPacketHealthChecker() *healthChecker {
|
func newPacketHealthChecker() *healthChecker {
|
||||||
var hosts []string
|
var hosts []string
|
||||||
for i := 1; i <= expectedHosts("host-linux-arm64-packet"); i++ {
|
for i := 1; i <= expectedHosts("host-linux-arm64-packet"); i++ {
|
||||||
|
|
|
@ -91,8 +91,6 @@ func TestHandleStatus_HealthFormatting(t *testing.T) {
|
||||||
}
|
}
|
||||||
for _, sub := range []string{
|
for _, sub := range []string{
|
||||||
`<a href="/status/macs">MacStadium Mac VMs</a> [`,
|
`<a href="/status/macs">MacStadium Mac VMs</a> [`,
|
||||||
`<a href="/status/scaleway">Scaleway linux/arm machines</a> [`,
|
|
||||||
`<li>scaleway-prod-02 not yet connected</li>`,
|
|
||||||
`<li>macstadium_host06a not yet connected</li>`,
|
`<li>macstadium_host06a not yet connected</li>`,
|
||||||
`<a href="/status/allgood">All Good Test</a>: ok`,
|
`<a href="/status/allgood">All Good Test</a>: ok`,
|
||||||
`<li>test-info</li>`,
|
`<li>test-info</li>`,
|
||||||
|
|
|
@ -205,13 +205,6 @@ var Hosts = map[string]*HostConfig{
|
||||||
env: []string{"GOROOT_BOOTSTRAP=/goboot"},
|
env: []string{"GOROOT_BOOTSTRAP=/goboot"},
|
||||||
SSHUsername: "root",
|
SSHUsername: "root",
|
||||||
},
|
},
|
||||||
"host-linux-arm-scaleway": &HostConfig{
|
|
||||||
IsReverse: true,
|
|
||||||
HermeticReverse: true,
|
|
||||||
ExpectNum: 50,
|
|
||||||
env: []string{"GOROOT_BOOTSTRAP=/usr/local/go"},
|
|
||||||
SSHUsername: "root",
|
|
||||||
},
|
|
||||||
"host-linux-arm5spacemonkey": &HostConfig{
|
"host-linux-arm5spacemonkey": &HostConfig{
|
||||||
IsReverse: true,
|
IsReverse: true,
|
||||||
ExpectNum: 3,
|
ExpectNum: 3,
|
||||||
|
@ -1960,36 +1953,6 @@ func init() {
|
||||||
},
|
},
|
||||||
numTryTestHelpers: 4, // Target time is < 15 min for golang.org/issue/42661.
|
numTryTestHelpers: 4, // Target time is < 15 min for golang.org/issue/42661.
|
||||||
})
|
})
|
||||||
addBuilder(BuildConfig{
|
|
||||||
Name: "linux-arm-scaleway",
|
|
||||||
HostType: "host-linux-arm-scaleway",
|
|
||||||
CrossCompileConfig: &CrossCompileConfig{
|
|
||||||
CompileHostType: "host-linux-armhf-cross",
|
|
||||||
CCForTarget: "arm-linux-gnueabihf-gcc",
|
|
||||||
GOARM: "7",
|
|
||||||
AlwaysCrossCompile: false,
|
|
||||||
},
|
|
||||||
tryBot: nil, // Issues #22748, #22749, #35628, #40872.
|
|
||||||
KnownIssue: 35628,
|
|
||||||
FlakyNet: true,
|
|
||||||
numTestHelpers: 2,
|
|
||||||
numTryTestHelpers: 7,
|
|
||||||
distTestAdjust: func(run bool, distTest string, isNormalTry bool) bool {
|
|
||||||
switch distTest {
|
|
||||||
case "api", "reboot":
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
return run
|
|
||||||
},
|
|
||||||
})
|
|
||||||
addBuilder(BuildConfig{
|
|
||||||
Name: "linux-arm-nativemake",
|
|
||||||
Notes: "runs make.bash on real ARM hardware, but does not run tests",
|
|
||||||
HostType: "host-linux-arm-scaleway",
|
|
||||||
tryOnly: true,
|
|
||||||
tryBot: nil,
|
|
||||||
StopAfterMake: true,
|
|
||||||
})
|
|
||||||
addBuilder(BuildConfig{
|
addBuilder(BuildConfig{
|
||||||
Name: "linux-arm-arm5spacemonkey",
|
Name: "linux-arm-arm5spacemonkey",
|
||||||
HostType: "host-linux-arm5spacemonkey",
|
HostType: "host-linux-arm5spacemonkey",
|
||||||
|
|
Загрузка…
Ссылка в новой задаче