Skip to content

Commit 3b206e5

Browse files
committed
cmd/buildlet, cmd/buildlet/stage0: remove references to removed builder
This removes the remaining references to the removed linux-arm-arm5spacemonkey builders. For golang/go#41027 Change-Id: I3df249ab6f7180a67d76a2ae037731f7223b8cbb Reviewed-on: https://go-review.googlesource.com/c/build/+/346531 Trust: Carlos Amedee <carlos@golang.org> Run-TryBot: Carlos Amedee <carlos@golang.org> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
1 parent 1b56216 commit 3b206e5

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

cmd/buildlet/buildlet.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,9 @@ const (
122122

123123
func main() {
124124
builderEnv := os.Getenv("GO_BUILDER_ENV")
125-
126-
switch builderEnv {
127-
case "macstadium_vm":
125+
if builderEnv == "macstadium_vm" {
128126
configureMacStadium()
129-
case "linux-arm-arm5spacemonkey":
130-
initBaseUnixEnv() // Issue 28041
131127
}
132-
133128
onGCE := metadata.OnGCE()
134129
switch runtime.GOOS {
135130
case "plan9":

cmd/buildlet/stage0/stage0.go

+1-9
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func main() {
7878
switch osArch {
7979
case "linux/arm":
8080
switch env := os.Getenv("GO_BUILDER_ENV"); env {
81-
case "linux-arm-arm5spacemonkey", "host-linux-arm-aws":
81+
case "host-linux-arm-aws":
8282
// No setup currently.
8383
default:
8484
panic(fmt.Sprintf("unknown/unspecified $GO_BUILDER_ENV value %q", env))
@@ -149,9 +149,6 @@ Download:
149149
buildEnv := os.Getenv("GO_BUILDER_ENV")
150150

151151
switch buildEnv {
152-
case "linux-arm-arm5spacemonkey":
153-
cmd.Args = append(cmd.Args, reverseHostTypeArgs("host-linux-arm5spacemonkey")...)
154-
cmd.Args = append(cmd.Args, os.ExpandEnv("--workdir=${WORKDIR}"))
155152
case "host-linux-arm-aws":
156153
cmd.Args = append(cmd.Args, os.ExpandEnv("--workdir=${WORKDIR}"))
157154
case "host-linux-arm64-aws":
@@ -310,11 +307,6 @@ func buildletURL() string {
310307
return v
311308
}
312309

313-
switch os.Getenv("GO_BUILDER_ENV") {
314-
case "linux-arm-arm5spacemonkey":
315-
return "https://storage.googleapis.com/go-builder-data/buildlet.linux-arm-arm5"
316-
}
317-
318310
if metadata.OnGCE() {
319311
v, err := metadata.InstanceAttributeValue(attr)
320312
if err == nil {

0 commit comments

Comments
 (0)