env: update nacl builders to be VM-based
Be lazy and use sid as a base, instead of trusty.
This replaces my earlier failed attempt: https://golang.org/cl/4960
Fixes golang/go#9879
Change-Id: Ia0a39c99747844b6e34bf7561c01dce49fa3b226
Reviewed-on: https://go-review.googlesource.com/5191
Reviewed-by: Russ Cox <rsc@golang.org>
diff --git a/dashboard/builders.go b/dashboard/builders.go
index 3f97849..6634c26 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -77,6 +77,9 @@
if strings.HasPrefix(c.Name, "plan9-") {
return "src/all.rc"
}
+ if strings.HasPrefix(c.Name, "nacl-") {
+ return "src/nacltest.bash"
+ }
return "src/all.bash"
}
@@ -175,10 +178,6 @@
tool: "gccgo",
})
- // TODO(bradfitz,adg,jbd): convert nacl builders to be VMs too:
- addBuilder(BuildConfig{Name: "nacl-386"})
- addBuilder(BuildConfig{Name: "nacl-amd64p32"})
-
// VMs:
addBuilder(BuildConfig{
Name: "freebsd-amd64-gce93",
@@ -277,6 +276,18 @@
env: []string{"GOROOT_BOOTSTRAP=/go1.4"},
})
addBuilder(BuildConfig{
+ Name: "nacl-386",
+ VMImage: "linux-buildlet-nacl",
+ buildletURL: "http://storage.googleapis.com/go-builder-data/buildlet.linux-amd64",
+ env: []string{"GOROOT_BOOTSTRAP=/go1.4", "GOOS=nacl", "GOARCH=386", "GOHOSTOS=linux", "GOHOSTARCH=amd64"},
+ })
+ addBuilder(BuildConfig{
+ Name: "nacl-amd64p32",
+ VMImage: "linux-buildlet-nacl",
+ buildletURL: "http://storage.googleapis.com/go-builder-data/buildlet.linux-amd64",
+ env: []string{"GOROOT_BOOTSTRAP=/go1.4", "GOOS=nacl", "GOARCH=amd64p32", "GOHOSTOS=linux", "GOHOSTARCH=amd64"},
+ })
+ addBuilder(BuildConfig{
Name: "openbsd-amd64-gce56",
VMImage: "openbsd-amd64-56",
machineType: "n1-highcpu-2",
@@ -362,15 +373,6 @@
if c.tool == "" {
c.tool = "go"
}
-
- if strings.HasPrefix(c.Name, "nacl-") {
- if c.Image == "" {
- c.Image = "gobuilders/linux-x86-nacl"
- }
- if c.cmd == "" {
- c.cmd = "/usr/local/bin/build-command.pl"
- }
- }
if strings.HasPrefix(c.Name, "linux-") && c.Image == "" && c.VMImage == "" {
c.Image = "gobuilders/linux-x86-base"
}
