Skip to content

Commit b729977

Browse files
bradfitzcodebien
authored andcommitted
dashboard, cmd/coordinator: add linux-riscv64 builder, fix bug from CL 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 <[email protected]>
1 parent 2045f66 commit b729977

File tree

2 files changed

+30
-1
lines changed

2 files changed

+30
-1
lines changed

Diff for: cmd/coordinator/reverse.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ func handleReverse(w http.ResponseWriter, r *http.Request) {
562562
}
563563

564564
// Check build keys.
565-
if hostType != "" {
565+
if hostType == "" {
566566
http.Error(w, "missing X-Go-Host-Type; old buildlet binary?", http.StatusBadRequest)
567567
return
568568
}

Diff for: dashboard/builders.go

+29
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ var slowBotAliases = map[string]string{
6464
"linux-mipsle": "linux-mipsle-rtrk",
6565
"linux-ppc64": "linux-ppc64-buildlet",
6666
"linux-ppc64le": "linux-ppc64le-buildlet",
67+
"linux-riscv64": "linux-riscv64-unleashed",
6768
"linux-s390x": "linux-s390x-ibm",
6869
"longtest": "linux-amd64-longtest",
6970
"mac": "darwin-amd64-10_14",
@@ -87,6 +88,7 @@ var slowBotAliases = map[string]string{
8788
"plan9-amd64": "plan9-amd64-9front",
8889
"ppc64": "linux-ppc64-buildlet",
8990
"ppc64le": "linux-ppc64le-buildlet",
91+
"riscv64": "linux-riscv64-unleashed",
9092
"s390x": "linux-s390x-ibm",
9193
"solaris": "solaris-amd64-oraclerel",
9294
"solaris-amd64": "solaris-amd64-oraclerel",
@@ -209,6 +211,13 @@ var Hosts = map[string]*HostConfig{
209211
env: []string{"GOROOT_BOOTSTRAP=/usr/local/go"},
210212
OwnerGithub: "esnolte", // https://github.com/golang/go/issues/34973#issuecomment-543836871
211213
},
214+
"host-linux-riscv64-unleashed": &HostConfig{
215+
Notes: "SiFive HiFive Unleashed RISC-V board. 8 GB RAM, 4 cores.",
216+
IsReverse: true,
217+
ExpectNum: 1, // for now. Joel's board might join the party later.
218+
OwnerGithub: "bradfitz", // at home
219+
env: []string{"GOROOT_BOOTSTRAP=/usr/local/goboot"},
220+
},
212221
"host-openbsd-amd64-60": &HostConfig{
213222
VMImage: "openbsd-amd64-60",
214223
machineType: "n1-highcpu-4",
@@ -2293,6 +2302,26 @@ func init() {
22932302
"GOHOSTARCH=mips",
22942303
},
22952304
})
2305+
addBuilder(BuildConfig{
2306+
HostType: "host-linux-riscv64-unleashed",
2307+
Name: "linux-riscv64-unleashed",
2308+
SkipSnapshot: true,
2309+
shouldRunDistTest: func(distTest string, isTry bool) bool {
2310+
switch distTest {
2311+
case "api", "reboot":
2312+
return false
2313+
}
2314+
return true
2315+
},
2316+
buildsRepo: func(repo, branch, goBranch string) bool {
2317+
switch repo {
2318+
case "go", "net", "sys":
2319+
return branch == "master" && goBranch == "master"
2320+
default:
2321+
return false
2322+
}
2323+
},
2324+
})
22962325
addBuilder(BuildConfig{
22972326
Name: "linux-s390x-ibm",
22982327
HostType: "host-linux-s390x",

0 commit comments

Comments
 (0)