Skip to content

Commit bed69d6

Browse files
committed
dashboard: add FreeBSD 11 builders
Fixes golang/go#19097 Change-Id: I29725ef511f03e10d93561889b1a4a00eb959177 Reviewed-on: https://go-review.googlesource.com/37498 Reviewed-by: Brad Fitzpatrick <[email protected]>
1 parent dd8f567 commit bed69d6

File tree

3 files changed

+36
-5
lines changed

3 files changed

+36
-5
lines changed

dashboard/builders.go

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,14 @@ var Hosts = map[string]*HostConfig{
9393
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
9494
env: []string{"CC=clang"},
9595
},
96+
"host-freebsd-110": &HostConfig{
97+
VMImage: "freebsd-amd64-110",
98+
Notes: "FreeBSD 11.0; GCE VM is built from script in build/env/freebsd-amd64",
99+
machineType: "n1-highcpu-4",
100+
buildletURLTmpl: "http://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64", // TODO(bradfitz): why was this http instead of https?
101+
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",
102+
env: []string{"CC=clang"},
103+
},
96104
"host-netbsd-70": &HostConfig{
97105
VMImage: "netbsd-amd64-70",
98106
Notes: "NetBSD 7.0_2016Q4; GCE VM is built from script in build/env/netbsd-amd64",
@@ -497,6 +505,7 @@ func (c *BuildConfig) BuildSubrepos() bool {
497505
"darwin-amd64-10_11",
498506
"darwin-386-10_11",
499507
"freebsd-386-gce101", "freebsd-amd64-gce101",
508+
"freebsd-386-110", "freebsd-amd64-110",
500509
"linux-386", "linux-amd64", "linux-amd64-nocgo",
501510
"openbsd-386-60", "openbsd-amd64-60",
502511
"plan9-386",
@@ -618,25 +627,33 @@ func (c *BuildConfig) NumTestHelpers(isTry bool) int {
618627

619628
func init() {
620629
addBuilder(BuildConfig{
621-
Name: "freebsd-amd64-gce93",
622-
HostType: "host-freebsd-93-gce",
623-
numTestHelpers: 1,
630+
Name: "freebsd-amd64-gce93",
631+
HostType: "host-freebsd-93-gce",
624632
})
625633
addBuilder(BuildConfig{
626634
Name: "freebsd-amd64-gce101",
627635
HostType: "host-freebsd-101-gce",
628636
numTestHelpers: 2,
629637
numTryTestHelpers: 4,
630638
})
639+
addBuilder(BuildConfig{
640+
Name: "freebsd-amd64-110",
641+
HostType: "host-freebsd-110",
642+
})
631643
addBuilder(BuildConfig{
632644
Name: "freebsd-amd64-race",
633-
HostType: "host-freebsd-101-gce",
645+
HostType: "host-freebsd-101-gce", // TODO(bradfitz): switch to FreeBSD 11? test first.
634646
})
635647
addBuilder(BuildConfig{
636648
Name: "freebsd-386-gce101",
637649
HostType: "host-freebsd-101-gce",
638650
env: []string{"GOARCH=386", "GOHOSTARCH=386"},
639651
})
652+
addBuilder(BuildConfig{
653+
Name: "freebsd-386-110",
654+
HostType: "host-freebsd-110",
655+
env: []string{"GOARCH=386", "GOHOSTARCH=386"},
656+
})
640657
addBuilder(BuildConfig{
641658
Name: "linux-386",
642659
HostType: "host-linux-kubestd",

env/freebsd-amd64/Makefile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
upload-staging:
2+
go install golang.org/x/build/cmd/upload
3+
upload --verbose --file=freebsd-amd64-110.tar.gz --public dev-go-builder-data/freebsd-amd64-110.tar.gz
4+
5+
upload-prod:
6+
go install golang.org/x/build/cmd/upload
7+
upload --verbose --file=freebsd-amd64-110.tar.gz --public go-builder-data/freebsd-amd64-110.tar.gz
8+
9+
create-image-staging:
10+
gcloud compute --project go-dashboard-dev images create freebsd-amd64-110 --source-uri gs://dev-go-builder-data/freebsd-amd64-110.tar.gz
11+
12+
create-image-prod:
13+
gcloud compute --project symbolic-datum-552 images create freebsd-amd64-110 --source-uri gs://go-builder-data/freebsd-amd64-110.tar.gz
14+

env/freebsd-amd64/make.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ case $1 in
4848
exit 1
4949
esac
5050

51-
readonly IMAGE=freebsd-amd64-gce${VERSION/\./}.tar.gz
51+
readonly IMAGE=freebsd-amd64-${VERSION/\./}.tar.gz
5252

5353
if [ $(tput cols) -lt 80 ]; then
5454
echo "Running qemu with curses display requires a window 80 columns or larger or expect(1) won't work correctly."

0 commit comments

Comments
 (0)