File tree Expand file tree Collapse file tree 6 files changed +3
-91
lines changed Expand file tree Collapse file tree 6 files changed +3
-91
lines changed Original file line number Diff line number Diff line change @@ -85,7 +85,7 @@ func main() {
85
85
}
86
86
case "linux/arm64" :
87
87
switch env := os .Getenv ("GO_BUILDER_ENV" ); env {
88
- case "host-linux-arm64-packet" , "host-linux-arm64-linaro" :
88
+ case "host-linux-arm64-packet" :
89
89
// No special setup.
90
90
default :
91
91
panic (fmt .Sprintf ("unknown/unspecified $GO_BUILDER_ENV value %q" , env ))
@@ -171,7 +171,7 @@ Download:
171
171
cmd .Args = append (cmd .Args , reverseHostTypeArgs ("host-linux-s390x" )... )
172
172
case "linux/arm64" :
173
173
switch buildEnv {
174
- case "host-linux-arm64-packet" , "host-linux-arm64-linaro" :
174
+ case "host-linux-arm64-packet" :
175
175
hostname := os .Getenv ("HOSTNAME" ) // if empty, docker container name is used
176
176
cmd .Args = append (cmd .Args ,
177
177
"--reverse-type=" + buildEnv ,
Original file line number Diff line number Diff line change @@ -402,15 +402,6 @@ var Hosts = map[string]*HostConfig{
402
402
SSHUsername : "debian" ,
403
403
HermeticReverse : false , // TODO: use rundockerbuildlet like arm64
404
404
},
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
- },
414
405
"host-linux-arm64-packet" : & HostConfig {
415
406
Notes : "On 96 core packet.net host (Xenial) in Docker containers (Jessie); run by Go team. See x/build/env/linux-arm64/packet" ,
416
407
IsReverse : true ,
@@ -1875,15 +1866,10 @@ func init() {
1875
1866
HostType : "host-linux-ppc64le-power9-osu" ,
1876
1867
FlakyNet : true ,
1877
1868
})
1878
- addBuilder (BuildConfig {
1879
- Name : "linux-arm64-buildlet" ,
1880
- HostType : "host-linux-arm64-linaro" ,
1881
- FlakyNet : true ,
1882
- })
1883
1869
addBuilder (BuildConfig {
1884
1870
Name : "linux-arm64-packet" ,
1885
1871
HostType : "host-linux-arm64-packet" ,
1886
- FlakyNet : true , // unknown; just copied from the linaro one
1872
+ FlakyNet : true , // maybe not flaky, but here conservatively
1887
1873
})
1888
1874
addBuilder (BuildConfig {
1889
1875
Name : "linux-mips" ,
Load Diff This file was deleted.
Load Diff This file was deleted.
Load Diff This file was deleted.
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments