Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
x/build: bootstrap tweaks for solaris builders
Change bootstrap logic for solaris builders to avoid applying it to
Oracle Solaris builders. Additionally, update the location of the
Go bootstrap to reflect actual Oracle Solaris builder configuration.

Fixes golang/go#21241

Change-Id: Ia2f21fab1581b4c195256c0dca7a87b4212798bf
Reviewed-on: https://go-review.googlesource.com/52310
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
  • Loading branch information
binarycrusader authored and bradfitz committed Aug 2, 2017
1 parent 794fc82 commit 821d1eb
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
11 changes: 11 additions & 0 deletions cmd/buildlet/buildlet.go
Expand Up @@ -222,6 +222,17 @@ func initGorootBootstrap() {
os.Setenv("GOROOT_BOOTSTRAP", filepath.Join(*workDir, "go1.4"))

if runtime.GOOS == "solaris" && runtime.GOARCH == "amd64" {
gbenv := os.Getenv("GO_BUILDER_ENV")
if strings.Contains(gbenv, "oracle") {
// Oracle Solaris; not OpenSolaris-based or
// Illumos-based. Do nothing.
return
}

// Assume this is an OpenSolaris-based machine or a
// SmartOS/Illumos machine before GOOS=="illumos" split. For
// these machines, the old Joyent builders need to get the
// bootstrap and some config fixed.
os.Setenv("PATH", os.Getenv("PATH")+":/opt/local/bin")
downloadBootstrapGoroot("/root/go-solaris-amd64-bootstrap", "https://storage.googleapis.com/go-builder-data/gobootstrap-solaris-amd64.tar.gz")
}
Expand Down
4 changes: 2 additions & 2 deletions dashboard/builders.go
Expand Up @@ -292,15 +292,15 @@ var Hosts = map[string]*HostConfig{
OwnerGithub: "binarycrusader",
IsReverse: true,
ExpectNum: 1,
env: []string{"GOROOT_BOOTSTRAP=/opt/local/go-solaris-amd64-bootstrap"},
env: []string{"GOROOT_BOOTSTRAP=/opt/golang/go-solaris-amd64-bootstrap"},
},
"host-solaris-oracle-shawn": &HostConfig{
Notes: "Oracle Solaris amd64 Development System",
Owner: "shawn.walker@oracle.com",
OwnerGithub: "binarycrusader",
IsReverse: true,
ExpectNum: 1,
env: []string{"GOROOT_BOOTSTRAP=/opt/local/go-solaris-amd64-bootstrap"},
env: []string{"GOROOT_BOOTSTRAP=/opt/golang/go-solaris-amd64-bootstrap"},
},
"host-linux-mips": &HostConfig{
Notes: "Run by Brendan Kirby, imgtec.com",
Expand Down

0 comments on commit 821d1eb

Please sign in to comment.