@@ -223,24 +223,6 @@ var Hosts = map[string]*HostConfig{
223
223
OwnerGithub : "bradfitz" , // at home
224
224
env : []string {"GOROOT_BOOTSTRAP=/usr/local/goboot" },
225
225
},
226
- "host-openbsd-amd64-60" : & HostConfig {
227
- VMImage : "openbsd-amd64-60" ,
228
- machineType : "n1-highcpu-4" ,
229
- // OpenBSD 6.0 requires binaries built with Go 1.10, per https://golang.org/wiki/OpenBSD
230
- buildletURLTmpl : "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-amd64.go1.10" ,
231
- goBootstrapURLTmpl : "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-amd64-60.tar.gz" ,
232
- Notes : "OpenBSD 6.0; GCE VM is built from script in build/env/openbsd-amd64" ,
233
- SSHUsername : "gopher" ,
234
- },
235
- "host-openbsd-386-60" : & HostConfig {
236
- VMImage : "openbsd-386-60" ,
237
- machineType : "n1-highcpu-4" ,
238
- // OpenBSD 6.0 requires binaries built with Go 1.10, per https://golang.org/wiki/OpenBSD
239
- buildletURLTmpl : "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-386.go1.10" ,
240
- goBootstrapURLTmpl : "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-386-60.tar.gz" ,
241
- Notes : "OpenBSD 6.0; GCE VM is built from script in build/env/openbsd-386" ,
242
- SSHUsername : "gopher" ,
243
- },
244
226
"host-openbsd-amd64-62" : & HostConfig {
245
227
VMImage : "openbsd-amd64-62" ,
246
228
machineType : "n1-highcpu-4" ,
@@ -280,30 +262,6 @@ var Hosts = map[string]*HostConfig{
280
262
env : []string {"GOROOT_BOOTSTRAP=/usr/local/go" },
281
263
OwnerGithub : "4a6f656c" ,
282
264
},
283
- "host-freebsd-93-gce" : & HostConfig {
284
- VMImage : "freebsd-amd64-gce93" ,
285
- machineType : "n1-highcpu-4" ,
286
- buildletURLTmpl : "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64" ,
287
- goBootstrapURLTmpl : "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz" ,
288
- SSHUsername : "gopher" ,
289
- },
290
- "host-freebsd-10_3" : & HostConfig {
291
- VMImage : "freebsd-amd64-103-b" ,
292
- Notes : "FreeBSD 10.3; GCE VM is built from script in build/env/freebsd-amd64" ,
293
- machineType : "n1-highcpu-4" ,
294
- buildletURLTmpl : "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64" ,
295
- goBootstrapURLTmpl : "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz" ,
296
- env : []string {"CC=clang" },
297
- SSHUsername : "gopher" ,
298
- },
299
- "host-freebsd-10_4" : & HostConfig {
300
- VMImage : "freebsd-amd64-104" ,
301
- Notes : "FreeBSD 10.4; GCE VM is built from script in build/env/freebsd-amd64" ,
302
- machineType : "n1-highcpu-4" ,
303
- buildletURLTmpl : "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64" ,
304
- goBootstrapURLTmpl : "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz" ,
305
- SSHUsername : "gopher" ,
306
- },
307
265
"host-freebsd-11_1" : & HostConfig {
308
266
VMImage : "freebsd-amd64-111-b" ,
309
267
Notes : "FreeBSD 11.1; GCE VM is built from script in build/env/freebsd-amd64" ,
@@ -1442,29 +1400,6 @@ func explicitTrySet(projs ...string) func(proj, branch, goBranch string) bool {
1442
1400
}
1443
1401
1444
1402
func init () {
1445
- addBuilder (BuildConfig {
1446
- Name : "freebsd-amd64-gce93" ,
1447
- HostType : "host-freebsd-93-gce" ,
1448
- buildsRepo : disabledBuilder ,
1449
- })
1450
- addBuilder (BuildConfig {
1451
- Name : "freebsd-amd64-10_3" ,
1452
- HostType : "host-freebsd-10_3" ,
1453
- buildsRepo : func (repo , branch , goBranch string ) bool {
1454
- return goBranch == "release-branch.go1.12" && buildRepoByDefault (repo )
1455
- },
1456
- tryBot : func (repo , branch , goBranch string ) bool {
1457
- return branch == "release-branch.go1.12"
1458
- },
1459
- })
1460
- addBuilder (BuildConfig {
1461
- Name : "freebsd-amd64-10_4" ,
1462
- HostType : "host-freebsd-10_4" ,
1463
- buildsRepo : func (repo , branch , goBranch string ) bool {
1464
- return goBranch == "release-branch.go1.12" && buildRepoByDefault (repo )
1465
- },
1466
- tryBot : nil ,
1467
- })
1468
1403
addBuilder (BuildConfig {
1469
1404
Name : "freebsd-amd64-11_1" ,
1470
1405
HostType : "host-freebsd-11_1" ,
@@ -1505,22 +1440,6 @@ func init() {
1505
1440
Name : "freebsd-amd64-race" ,
1506
1441
HostType : "host-freebsd-11_1-big" , // TODO(golang.org/issue/40562): Update to newer FreeBSD.
1507
1442
})
1508
- addBuilder (BuildConfig {
1509
- Name : "freebsd-386-10_3" ,
1510
- HostType : "host-freebsd-10_3" ,
1511
- buildsRepo : func (repo , branch , goBranch string ) bool {
1512
- return goBranch == "release-branch.go1.12" && buildRepoByDefault (repo )
1513
- },
1514
- env : []string {"GOARCH=386" , "GOHOSTARCH=386" },
1515
- })
1516
- addBuilder (BuildConfig {
1517
- Name : "freebsd-386-10_4" ,
1518
- HostType : "host-freebsd-10_4" ,
1519
- buildsRepo : func (repo , branch , goBranch string ) bool {
1520
- return goBranch == "release-branch.go1.12" && buildRepoByDefault (repo )
1521
- },
1522
- env : []string {"GOARCH=386" , "GOHOSTARCH=386" },
1523
- })
1524
1443
addBuilder (BuildConfig {
1525
1444
Name : "freebsd-386-11_1" ,
1526
1445
HostType : "host-freebsd-11_1" ,
@@ -1883,6 +1802,7 @@ func init() {
1883
1802
HostType : "host-nacl" ,
1884
1803
buildsRepo : func (repo , branch , goBranch string ) bool {
1885
1804
// nacl support is removed in Go 1.14.
1805
+ // TODO: Remove builder after Go 1.15 is out.
1886
1806
return repo == "go" && ! atLeastGo1 (goBranch , 14 ) && ! strings .HasPrefix (goBranch , "dev." )
1887
1807
},
1888
1808
numTryTestHelpers : 3 ,
@@ -1893,6 +1813,7 @@ func init() {
1893
1813
HostType : "host-nacl" ,
1894
1814
buildsRepo : func (repo , branch , goBranch string ) bool {
1895
1815
// nacl support is removed in Go 1.14.
1816
+ // TODO: Remove builder after Go 1.15 is out.
1896
1817
return repo == "go" && ! atLeastGo1 (goBranch , 14 ) && ! strings .HasPrefix (goBranch , "dev." )
1897
1818
},
1898
1819
tryBot : explicitTrySet ("go" ),
@@ -1933,27 +1854,6 @@ func init() {
1933
1854
"GO_DISABLE_OUTBOUND_NETWORK=1" ,
1934
1855
},
1935
1856
})
1936
- addBuilder (BuildConfig {
1937
- Name : "openbsd-amd64-60" ,
1938
- HostType : "host-openbsd-amd64-60" ,
1939
- distTestAdjust : noTestDirAndNoReboot ,
1940
- buildsRepo : disabledBuilder ,
1941
- numTestHelpers : 2 ,
1942
- numTryTestHelpers : 5 ,
1943
- })
1944
- addBuilder (BuildConfig {
1945
- Name : "openbsd-386-60" ,
1946
- HostType : "host-openbsd-386-60" ,
1947
- distTestAdjust : noTestDirAndNoReboot ,
1948
- buildsRepo : disabledBuilder ,
1949
- env : []string {
1950
- // cmd/go takes ~192 seconds on openbsd-386
1951
- // now, which is over the 180 second default
1952
- // dist test timeout. So, bump this builder
1953
- // up:
1954
- "GO_TEST_TIMEOUT_SCALE=2" ,
1955
- },
1956
- })
1957
1857
addBuilder (BuildConfig {
1958
1858
Name : "openbsd-386-62" ,
1959
1859
HostType : "host-openbsd-386-62" ,
0 commit comments