Skip to content

Commit

Permalink
dashboard, cmd/coordinator: add linux-riscv64 builder, fix bug from C…
Browse files Browse the repository at this point in the history
…L 205608

Updates golang/go#27532
Updates golang/go#30262

Change-Id: If1593ab6e5653a9dce625f25a16bf8a082796592
Reviewed-on: https://go-review.googlesource.com/c/build/+/206639
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
  • Loading branch information
bradfitz committed Nov 12, 2019
1 parent 4a3109b commit 773364d
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 1 deletion.
2 changes: 1 addition & 1 deletion cmd/coordinator/reverse.go
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ func handleReverse(w http.ResponseWriter, r *http.Request) {
}

// Check build keys.
if hostType != "" {
if hostType == "" {
http.Error(w, "missing X-Go-Host-Type; old buildlet binary?", http.StatusBadRequest)
return
}
Expand Down
29 changes: 29 additions & 0 deletions dashboard/builders.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ var slowBotAliases = map[string]string{
"linux-mipsle": "linux-mipsle-rtrk",
"linux-ppc64": "linux-ppc64-buildlet",
"linux-ppc64le": "linux-ppc64le-buildlet",
"linux-riscv64": "linux-riscv64-unleashed",
"linux-s390x": "linux-s390x-ibm",
"longtest": "linux-amd64-longtest",
"mac": "darwin-amd64-10_14",
Expand All @@ -87,6 +88,7 @@ var slowBotAliases = map[string]string{
"plan9-amd64": "plan9-amd64-9front",
"ppc64": "linux-ppc64-buildlet",
"ppc64le": "linux-ppc64le-buildlet",
"riscv64": "linux-riscv64-unleashed",
"s390x": "linux-s390x-ibm",
"solaris": "solaris-amd64-oraclerel",
"solaris-amd64": "solaris-amd64-oraclerel",
Expand Down Expand Up @@ -209,6 +211,13 @@ var Hosts = map[string]*HostConfig{
env: []string{"GOROOT_BOOTSTRAP=/usr/local/go"},
OwnerGithub: "esnolte", // https://github.com/golang/go/issues/34973#issuecomment-543836871
},
"host-linux-riscv64-unleashed": &HostConfig{
Notes: "SiFive HiFive Unleashed RISC-V board. 8 GB RAM, 4 cores.",
IsReverse: true,
ExpectNum: 1, // for now. Joel's board might join the party later.
OwnerGithub: "bradfitz", // at home
env: []string{"GOROOT_BOOTSTRAP=/usr/local/goboot"},
},
"host-openbsd-amd64-60": &HostConfig{
VMImage: "openbsd-amd64-60",
machineType: "n1-highcpu-4",
Expand Down Expand Up @@ -2293,6 +2302,26 @@ func init() {
"GOHOSTARCH=mips",
},
})
addBuilder(BuildConfig{
HostType: "host-linux-riscv64-unleashed",
Name: "linux-riscv64-unleashed",
SkipSnapshot: true,
shouldRunDistTest: func(distTest string, isTry bool) bool {
switch distTest {
case "api", "reboot":
return false
}
return true
},
buildsRepo: func(repo, branch, goBranch string) bool {
switch repo {
case "go", "net", "sys":
return branch == "master" && goBranch == "master"
default:
return false
}
},
})
addBuilder(BuildConfig{
Name: "linux-s390x-ibm",
HostType: "host-linux-s390x",
Expand Down

0 comments on commit 773364d

Please sign in to comment.