Skip to content

Commit 3e01d87

Browse files
committed
dashboard: remove the Windows ARM builder
The host-windows-arm-iotcore builder has been missing for an extended period of time. Attempts to contact the maintainer have failed. This removes the builder until we can find a replacement for windows-arm instances. Fixes golang/go#38493 For golang/go#38607 Change-Id: Ia7d2168f676a86bced754688b4e2d52e61f3125b Reviewed-on: https://go-review.googlesource.com/c/build/+/229559 Run-TryBot: Carlos Amedee <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent 5910a27 commit 3e01d87

File tree

3 files changed

+8
-25
lines changed

3 files changed

+8
-25
lines changed

cmd/buildlet/Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ compile:
3535
GOOS=windows GOARCH=amd64 go install golang.org/x/build/cmd/buildlet
3636

3737
# buildlet.all is compiles & uploads all targets.
38-
buildlet.all: FORCE buildlet.aix-ppc64 buildlet.darwin-amd64 buildlet.freebsd-amd64 buildlet.linux-amd64 buildlet.netbsd-386 buildlet.netbsd-amd64 buildlet.netbsd-arm buildlet.openbsd-amd64.go1.10 buildlet.openbsd-386.go1.10 buildlet.openbsd-amd64 buildlet.openbsd-386 buildlet.plan9-386 buildlet.windows-amd64 buildlet.windows-arm buildlet.linux-arm buildlet.linux-arm-arm5 buildlet.linux-arm64 buildlet.linux-riscv64 buildlet.linux-mips buildlet.linux-mipsle buildlet.linux-mips64 buildlet.linux-mips64le buildlet.linux-ppc64 buildlet.linux-ppc64le buildlet.linux-s390x buildlet.solaris-amd64 buildlet.illumos-amd64
38+
buildlet.all: FORCE buildlet.aix-ppc64 buildlet.darwin-amd64 buildlet.freebsd-amd64 buildlet.linux-amd64 buildlet.netbsd-386 buildlet.netbsd-amd64 buildlet.netbsd-arm buildlet.openbsd-amd64.go1.10 buildlet.openbsd-386.go1.10 buildlet.openbsd-amd64 buildlet.openbsd-386 buildlet.plan9-386 buildlet.windows-amd64 buildlet.linux-arm buildlet.linux-arm-arm5 buildlet.linux-arm64 buildlet.linux-riscv64 buildlet.linux-mips buildlet.linux-mipsle buildlet.linux-mips64 buildlet.linux-mips64le buildlet.linux-ppc64 buildlet.linux-ppc64le buildlet.linux-s390x buildlet.solaris-amd64 buildlet.illumos-amd64
3939
echo "done"
4040

4141
buildlet.aix-ppc64: FORCE
@@ -112,10 +112,6 @@ buildlet.plan9-amd64: FORCE
112112
go install golang.org/x/build/cmd/upload
113113
upload --verbose --osarch=$@ --file=go:golang.org/x/build/cmd/buildlet --public --cacheable=false go-builder-data/$@
114114

115-
buildlet.windows-arm: FORCE buildlet_windows.go
116-
go install golang.org/x/build/cmd/upload
117-
upload --verbose --osarch=$@ --file=go:golang.org/x/build/cmd/buildlet --public --cacheable=false go-builder-data/$@
118-
119115
buildlet.windows-amd64: FORCE buildlet_windows.go
120116
go install golang.org/x/build/cmd/upload
121117
upload --verbose --osarch=$@ --file=go:golang.org/x/build/cmd/buildlet --public --cacheable=false go-builder-data/$@

dashboard/builders.go

+2-17
Original file line numberDiff line numberDiff line change
@@ -472,12 +472,6 @@ var Hosts = map[string]*HostConfig{
472472
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-windows-amd64.tar.gz",
473473
SSHUsername: "gopher",
474474
},
475-
"host-windows-arm-iotcore": &HostConfig{
476-
IsReverse: true,
477-
ExpectNum: 1,
478-
OwnerGithub: "jordanrh1",
479-
env: []string{"GOROOT_BOOTSTRAP=C:\\Data\\Go"},
480-
},
481475
"host-darwin-10_11": &HostConfig{
482476
IsReverse: true,
483477
ExpectNum: 3,
@@ -1575,8 +1569,8 @@ func init() {
15751569
addMiscCompile("-netbsd", "^netbsd-") // 4: amd64, 386, arm, arm64
15761570
addMiscCompile("-openbsd", "^openbsd-") // 4: amd64, 386, arm, arm64
15771571

1578-
// And 4 that don't fit above:
1579-
addMiscCompile("-other", "^(windows-arm|linux-s390x|linux-riscv64|dragonfly-amd64)$")
1572+
// And 3 that don't fit above:
1573+
addMiscCompile("-other", "^(linux-s390x|linux-riscv64|dragonfly-amd64)$")
15801574
// TODO: Issue 25963, get the misc-compile trybots for
15811575
// subrepos too, so "mobile" can at least be included as a
15821576
// misc-compile for ^android- and ^darwin-arm.
@@ -2072,15 +2066,6 @@ func init() {
20722066
// up:
20732067
"GO_TEST_TIMEOUT_SCALE=2"},
20742068
})
2075-
addBuilder(BuildConfig{
2076-
Name: "windows-arm",
2077-
HostType: "host-windows-arm-iotcore",
2078-
SkipSnapshot: true,
2079-
env: []string{
2080-
"GOARM=7",
2081-
"GO_TEST_TIMEOUT_SCALE=2",
2082-
},
2083-
})
20842069
addBuilder(BuildConfig{
20852070
Name: "darwin-amd64-10_11",
20862071
HostType: "host-darwin-10_11",

dashboard/builders_test.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -712,6 +712,8 @@ func TestSlowBotAliases(t *testing.T) {
712712
ports := strings.Fields(string(out))
713713

714714
done := map[string]bool{}
715+
done["windows-arm"] = true // TODO(golang.org/issue/38607) disabled until builder is replaced
716+
715717
var add bytes.Buffer
716718
check := func(term string, isArch bool) {
717719
if done[term] {
@@ -780,8 +782,9 @@ func TestTryBotsCompileAllPorts(t *testing.T) {
780782
ports := strings.Fields(string(out))
781783

782784
done := map[string]bool{}
783-
done["nacl-386"] = true // removed in Go 1.14
784-
done["nacl-arm"] = true // removed in Go 1.14
785+
done["nacl-386"] = true // removed in Go 1.14
786+
done["nacl-arm"] = true // removed in Go 1.14
787+
done["windows-arm"] = true // TODO(golang.org/issue/38607) disabled until builder is replaced
785788
check := func(goos, goarch string) {
786789
if goos == "android" {
787790
// TODO(golang.org/issue/25963): support
@@ -820,7 +823,6 @@ func TestTryBotsCompileAllPorts(t *testing.T) {
820823
if _, ok := done[goosArch]; !ok {
821824
t.Errorf("Missing trybot or misc-compile trybot: %q", goosArch)
822825
}
823-
824826
}
825827

826828
for _, port := range ports {

0 commit comments

Comments
 (0)