Skip to content

Commit ecb2bc4

Browse files
committed
dashboard, env/freebsd-amd64: update to FreeBSD 10.3 and 11.1.
freebsd.org says that the current supported releases are: > Production: 11.1, 11.0, 10.4, 10.3 Previously we had builders for 9.3, 10.1, and 11.0. We'll keep FreeBSD 9.3 for now (as it's still supported by the last two released Go versions), but we'll stop testing FreeBSD 9.3 at tip shortly here (that will be a separate change). This CL updates our builders from 11.0 to 11.1 and 10.1 to 10.3, spanning the range from the old to newest supported release. We'll stop testing 10.4 and 11.0, as that's a bit overkill. Another reason we're doing 10.3 instead of 10.4 is because the Go 1.9 release notes (https://golang.org/doc/go1.9#freebsd) said that future Go releases (Go 1.10) will require FreeBSD 10.3+, so we need to test FreeBSD 10.3, being the oldest. (Go has historically "supported" FreeBSD releases a bit longer than they're officially supported by FreeBSD, partly due to our out-of-sync release cycles.) Fixes golang/go#19303 Fixes golang/go#22854 Change-Id: I69589000b1c87aecf054857f514cc48ccedf752f Reviewed-on: https://go-review.googlesource.com/80297 Reviewed-by: Andrew Bonventre <[email protected]>
1 parent 2b2acc8 commit ecb2bc4

File tree

3 files changed

+32
-23
lines changed

3 files changed

+32
-23
lines changed

dashboard/builders.go

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -143,18 +143,18 @@ var Hosts = map[string]*HostConfig{
143143
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
144144
SSHUsername: "gopher",
145145
},
146-
"host-freebsd-101-gce": &HostConfig{
147-
VMImage: "freebsd-amd64-gce101",
148-
Notes: "FreeBSD 10.1; GCE VM is built from script in build/env/freebsd-amd64",
146+
"host-freebsd-10_3": &HostConfig{
147+
VMImage: "freebsd-amd64-103",
148+
Notes: "FreeBSD 10.3; GCE VM is built from script in build/env/freebsd-amd64",
149149
machineType: "n1-highcpu-4",
150150
buildletURLTmpl: "http://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64", // TODO(bradfitz): why was this http instead of https?
151151
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
152152
env: []string{"CC=clang"},
153153
SSHUsername: "gopher",
154154
},
155-
"host-freebsd-110": &HostConfig{
156-
VMImage: "freebsd-amd64-110",
157-
Notes: "FreeBSD 11.0; GCE VM is built from script in build/env/freebsd-amd64",
155+
"host-freebsd-11_1": &HostConfig{
156+
VMImage: "freebsd-amd64-111",
157+
Notes: "FreeBSD 11.1; GCE VM is built from script in build/env/freebsd-amd64",
158158
machineType: "n1-highcpu-4",
159159
buildletURLTmpl: "http://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64", // TODO(bradfitz): why was this http instead of https?
160160
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
@@ -715,8 +715,9 @@ func (c *BuildConfig) BuildSubrepos() bool {
715715
"darwin-amd64-10_10",
716716
"darwin-amd64-10_11",
717717
"darwin-386-10_11",
718-
"freebsd-386-gce101", "freebsd-amd64-gce101",
719-
"freebsd-386-110", "freebsd-amd64-110",
718+
"freebsd-amd64-93",
719+
"freebsd-386-10_3", "freebsd-amd64-10_3",
720+
"freebsd-386-11_1", "freebsd-amd64-11_1",
720721
"linux-386", "linux-amd64", "linux-amd64-nocgo",
721722
"openbsd-386-60", "openbsd-amd64-60",
722723
"openbsd-386-62", "openbsd-amd64-62",
@@ -864,34 +865,36 @@ func init() {
864865
addBuilder(BuildConfig{
865866
Name: "freebsd-amd64-gce93",
866867
HostType: "host-freebsd-93-gce",
867-
MaxAtOnce: 2, // arbitrary, just not unlimited; delete when we have proper scheduler
868+
TryOnly: true, // don't run regular build...
869+
TryBot: false, // .. and don't be a trybot. Only for gomote.
870+
MaxAtOnce: 2, // arbitrary, just not unlimited; delete when we have proper scheduler
868871
})
869872
addBuilder(BuildConfig{
870-
Name: "freebsd-amd64-gce101",
871-
HostType: "host-freebsd-101-gce",
873+
Name: "freebsd-amd64-10_3",
874+
HostType: "host-freebsd-10_3",
872875
MaxAtOnce: 2, // arbitrary, just not unlimited; delete when we have proper scheduler
873876
})
874877
addBuilder(BuildConfig{
875-
Name: "freebsd-amd64-110",
876-
HostType: "host-freebsd-110",
878+
Name: "freebsd-amd64-11_1",
879+
HostType: "host-freebsd-11_1",
877880
TryBot: true,
878881
numTryTestHelpers: 4,
879882
MaxAtOnce: 2, // arbitrary, just not unlimited; delete when we have proper scheduler
880883
})
881884
addBuilder(BuildConfig{
882885
Name: "freebsd-amd64-race",
883-
HostType: "host-freebsd-110",
886+
HostType: "host-freebsd-11_1",
884887
MaxAtOnce: 2, // arbitrary, just not unlimited; delete when we have proper scheduler
885888
})
886889
addBuilder(BuildConfig{
887-
Name: "freebsd-386-gce101",
888-
HostType: "host-freebsd-101-gce",
890+
Name: "freebsd-386-10_3",
891+
HostType: "host-freebsd-10_3",
889892
env: []string{"GOARCH=386", "GOHOSTARCH=386"},
890893
MaxAtOnce: 2, // arbitrary, just not unlimited; delete when we have proper scheduler
891894
})
892895
addBuilder(BuildConfig{
893-
Name: "freebsd-386-110",
894-
HostType: "host-freebsd-110",
896+
Name: "freebsd-386-11_1",
897+
HostType: "host-freebsd-11_1",
895898
env: []string{"GOARCH=386", "GOHOSTARCH=386"},
896899
MaxAtOnce: 2, // arbitrary, just not unlimited; delete when we have proper scheduler
897900
})

env/freebsd-amd64/README

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ make.bash should be run on a Linux box with qemu.
66
After it completes, it creates a file freebsd-amd64-gce101.tar.gz
77

88
Then:
9-
gsutil cp -a public-read freebsd-amd64-gce101.tar.gz gs://go-builder-data/freebsd-amd64-gce101.tar.gz
9+
gsutil cp -a public-read freebsd-amd64-103.tar.gz gs://go-builder-data/freebsd-amd64-103.tar.gz
1010
Or just use the web UI at:
1111
https://console.developers.google.com/project/symbolic-datum-552/storage/browser/go-builder-data/
1212

1313
Then:
14-
gcloud compute --project symbolic-datum-552 images delete freebsd-amd64-gce101
15-
gcloud compute --project symbolic-datum-552 images create freebsd-amd64-gce101 --source-uri gs://go-builder-data/freebsd-amd64-gce101.tar.gz
14+
gcloud compute --project symbolic-datum-552 images delete freebsd-amd64-103
15+
gcloud compute --project symbolic-datum-552 images create freebsd-amd64-103 --source-uri gs://go-builder-data/freebsd-amd64-103.tar.gz
1616

1717
The VM needs to be run with the GCE metadata attribute "buildlet-binary-url" set to a URL
1818
of the FreeBSD buildlet (cross-compiled, typically).

env/freebsd-amd64/make.bash

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# SSH is enabled, and a user gopher, password gopher, is created.
1010

1111
# Only tested on Ubuntu 16.04.
12-
# Requires packages: qemu expect mkisofs
12+
# Requires packages: qemu expect genisoimage
1313

1414
set -e
1515

@@ -41,6 +41,12 @@ case $1 in
4141
readonly VERSION_TRAILER=
4242
readonly DNS_LOOKUP=drill
4343
readonly SHA256=f9f7fcac1acfe210979a72e0642a70fcf9c9381cc1884e966eac8381c724158c
44+
;;
45+
11.1)
46+
readonly VERSION=11.1
47+
readonly VERSION_TRAILER=
48+
readonly DNS_LOOKUP=drill
49+
readonly SHA256=233c6b269a29c1ce38bb4eb861251d1c74643846c1de937b8e31cc0316632bc0
4450
;;
4551
*)
4652
echo "Usage: $0 <version>"
@@ -122,7 +128,7 @@ echo '-h' > /boot.conf
122128
echo 'console="comconsole"' >> /boot/loader.conf
123129
EOF
124130

125-
mkisofs -r -o config.iso iso/
131+
genisoimage -r -o config.iso iso/
126132
# TODO(wathiede): remove sleep
127133
sleep 2
128134

0 commit comments

Comments
 (0)