Skip to content

Commit 8fa933c

Browse files
committed
all: remove config for arm64 linaro builders
They've been decomissioned for some months now. Our arm64 builders are on packet.net these days. Change-Id: Iaede189157e0298812b2971cdd63599f6096d73d Reviewed-on: https://go-review.googlesource.com/c/build/+/165781 Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent aef5298 commit 8fa933c

File tree

6 files changed

+3
-91
lines changed

6 files changed

+3
-91
lines changed

cmd/buildlet/stage0/stage0.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func main() {
8585
}
8686
case "linux/arm64":
8787
switch env := os.Getenv("GO_BUILDER_ENV"); env {
88-
case "host-linux-arm64-packet", "host-linux-arm64-linaro":
88+
case "host-linux-arm64-packet":
8989
// No special setup.
9090
default:
9191
panic(fmt.Sprintf("unknown/unspecified $GO_BUILDER_ENV value %q", env))
@@ -171,7 +171,7 @@ Download:
171171
cmd.Args = append(cmd.Args, reverseHostTypeArgs("host-linux-s390x")...)
172172
case "linux/arm64":
173173
switch buildEnv {
174-
case "host-linux-arm64-packet", "host-linux-arm64-linaro":
174+
case "host-linux-arm64-packet":
175175
hostname := os.Getenv("HOSTNAME") // if empty, docker container name is used
176176
cmd.Args = append(cmd.Args,
177177
"--reverse-type="+buildEnv,

dashboard/builders.go

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -402,15 +402,6 @@ var Hosts = map[string]*HostConfig{
402402
SSHUsername: "debian",
403403
HermeticReverse: false, // TODO: use rundockerbuildlet like arm64
404404
},
405-
"host-linux-arm64-linaro": &HostConfig{
406-
Notes: "Ubuntu xenial; run by Go team, from linaro",
407-
IsReverse: true,
408-
HermeticReverse: true,
409-
ExpectNum: 5,
410-
env: []string{"GOROOT_BOOTSTRAP=/usr/local/go-bootstrap"},
411-
ReverseAliases: []string{"linux-arm64-buildlet"},
412-
SSHUsername: "root",
413-
},
414405
"host-linux-arm64-packet": &HostConfig{
415406
Notes: "On 96 core packet.net host (Xenial) in Docker containers (Jessie); run by Go team. See x/build/env/linux-arm64/packet",
416407
IsReverse: true,
@@ -1875,15 +1866,10 @@ func init() {
18751866
HostType: "host-linux-ppc64le-power9-osu",
18761867
FlakyNet: true,
18771868
})
1878-
addBuilder(BuildConfig{
1879-
Name: "linux-arm64-buildlet",
1880-
HostType: "host-linux-arm64-linaro",
1881-
FlakyNet: true,
1882-
})
18831869
addBuilder(BuildConfig{
18841870
Name: "linux-arm64-packet",
18851871
HostType: "host-linux-arm64-packet",
1886-
FlakyNet: true, // unknown; just copied from the linaro one
1872+
FlakyNet: true, // maybe not flaky, but here conservatively
18871873
})
18881874
addBuilder(BuildConfig{
18891875
Name: "linux-mips",

env/linux-arm64/linaro/Dockerfile

Lines changed: 0 additions & 9 deletions
This file was deleted.

env/linux-arm64/linaro/README

Lines changed: 0 additions & 46 deletions
This file was deleted.

env/linux-arm64/linaro/build.sh

Lines changed: 0 additions & 6 deletions
This file was deleted.

env/linux-arm64/linaro/rundockerbuildlet.service

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)