From 94fda4902ce5ccd4f9db2ca4908375500570fd0b Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mzh@golangcn.org>
Date: Sun, 19 May 2024 18:26:21 +0800
Subject: [PATCH] main.star: remove freebsd-riscv64 known issue

The builder is up and working. There are occasional temporary network
errors, but that can be improved upon separately.

Fixes golang/go#63482.

Change-Id: I5ebaf61aee4c8f3ec0031c6b9544126d5343ec20
Reviewed-on: https://go-review.googlesource.com/c/build/+/586036
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Carlos Amedee <carlos@golang.org>
---
 generated/cr-buildbucket.cfg |  506 +++++++----
 generated/luci-milo.cfg      | 1603 ++++++++++++----------------------
 main.star                    |    5 +-
 3 files changed, 879 insertions(+), 1235 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 672e60796c..13d673008c 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -1082,13 +1082,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "go",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -3582,6 +3582,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -5977,13 +5978,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "go",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -8536,6 +8537,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -10935,13 +10937,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "go",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -13494,6 +13496,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -14110,7 +14113,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -15459,13 +15462,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "arch",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -16650,6 +16653,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -17950,13 +17954,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "arch",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -19141,6 +19145,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -20445,13 +20450,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "arch",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -21636,6 +21641,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -21908,7 +21914,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -23046,13 +23052,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "benchmarks",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -24237,6 +24243,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -25537,13 +25544,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "benchmarks",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -26728,6 +26735,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -28032,13 +28040,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "benchmarks",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -29223,6 +29231,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -29495,7 +29504,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -32934,13 +32943,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "crypto",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -34125,6 +34134,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -35425,13 +35435,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "crypto",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -36616,6 +36626,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -37920,13 +37931,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "crypto",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -39111,6 +39122,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -39383,7 +39395,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -40521,13 +40533,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "debug",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -41712,6 +41724,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -43012,13 +43025,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "debug",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -44203,6 +44216,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -45507,13 +45521,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "debug",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -46698,6 +46712,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -46970,7 +46985,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -51504,13 +51519,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "image",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -52695,6 +52710,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -53995,13 +54011,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "image",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -55186,6 +55202,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -56490,13 +56507,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "image",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -57681,6 +57698,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -57953,7 +57971,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -60057,13 +60075,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "mod",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -61248,6 +61266,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -62548,13 +62567,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "mod",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -63739,6 +63758,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -65043,13 +65063,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "mod",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -66234,6 +66254,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -66506,7 +66527,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -67644,13 +67665,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "net",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -68835,6 +68856,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -70135,13 +70157,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "net",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -71326,6 +71348,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -72630,13 +72653,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "net",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -73821,6 +73844,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -74093,7 +74117,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -75231,13 +75255,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "oauth2",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -76422,6 +76446,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -77722,13 +77747,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "oauth2",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -78913,6 +78938,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -80217,13 +80243,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "oauth2",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -81408,6 +81434,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -81680,7 +81707,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -94323,13 +94350,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "sync",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -95514,6 +95541,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -96814,13 +96842,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "sync",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -98005,6 +98033,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -99309,13 +99338,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "sync",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -100500,6 +100529,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -100772,7 +100802,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -101910,13 +101940,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "sys",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -103101,6 +103131,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -104401,13 +104432,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "sys",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -105592,6 +105623,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -106896,13 +106928,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "sys",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -108087,6 +108119,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -108359,7 +108392,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -109497,13 +109530,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "telemetry",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -110688,6 +110721,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -111988,13 +112022,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "telemetry",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -113179,6 +113213,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -114483,13 +114518,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "telemetry",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -115674,6 +115709,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -115946,7 +115982,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -117084,13 +117120,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "term",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -118275,6 +118311,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -119575,13 +119612,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "term",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -120766,6 +120803,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -122070,13 +122108,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "term",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -123261,6 +123299,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -123533,7 +123572,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -124671,13 +124710,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "text",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -125862,6 +125901,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -127162,13 +127202,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "text",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -128353,6 +128393,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -129657,13 +129698,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "text",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -130848,6 +130889,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -131120,7 +131162,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -132258,13 +132300,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "time",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -133449,6 +133491,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -134749,13 +134792,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "time",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -135940,6 +135983,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -137244,13 +137288,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "time",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -138435,6 +138479,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -138707,7 +138752,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -139949,13 +139994,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "tools",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -141195,6 +141240,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -142495,13 +142541,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "tools",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -143741,6 +143787,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -145045,13 +145092,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "tools",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -146236,6 +146283,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -146508,7 +146556,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -154549,13 +154597,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "dl",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -155740,6 +155788,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -157040,13 +157089,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "dl",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -158231,6 +158280,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -159535,13 +159585,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "dl",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -160726,6 +160776,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -160998,7 +161049,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 40
@@ -206696,13 +206747,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "go",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -209157,6 +209208,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -211402,13 +211454,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "go",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -213922,6 +213974,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -216171,13 +216224,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "go",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -218691,6 +218744,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -219290,7 +219344,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -220527,13 +220581,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "arch",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -221718,6 +221772,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -223018,13 +223073,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "arch",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -224209,6 +224264,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -225513,13 +225569,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "arch",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -226704,6 +226760,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -226976,7 +227033,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -228114,13 +228171,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "benchmarks",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -229305,6 +229362,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -230605,13 +230663,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "benchmarks",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -231796,6 +231854,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -233100,13 +233159,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "benchmarks",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -234291,6 +234350,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -234563,7 +234623,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -235648,13 +235708,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "build",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -236786,6 +236846,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -238033,13 +238094,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "build",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -239171,6 +239232,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -240422,13 +240484,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "build",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -241560,6 +241622,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -241832,7 +241895,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -242970,13 +243033,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "crypto",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -244161,6 +244224,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -245461,13 +245525,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "crypto",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -246652,6 +246716,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -247956,13 +248021,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "crypto",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -249147,6 +249212,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -249419,7 +249485,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -250557,13 +250623,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "debug",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -251748,6 +251814,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -253048,13 +253115,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "debug",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -254239,6 +254306,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -255543,13 +255611,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "debug",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -256734,6 +256802,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -257006,7 +257075,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -258091,13 +258160,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "exp",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -259229,6 +259298,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -260476,13 +260546,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "exp",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -261614,6 +261684,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -262865,13 +262936,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "exp",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -264003,6 +264074,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -264275,7 +264347,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -265413,13 +265485,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "image",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -266604,6 +266676,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -267904,13 +267977,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "image",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -269095,6 +269168,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -270399,13 +270473,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "image",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -271590,6 +271664,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -271862,7 +271937,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -272947,13 +273022,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "mobile",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -274085,6 +274160,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -275332,13 +275408,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "mobile",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -276470,6 +276546,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -277721,13 +277798,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "mobile",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -278859,6 +278936,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -279131,7 +279209,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -280269,13 +280347,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "mod",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -281460,6 +281538,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -282760,13 +282839,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "mod",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -283951,6 +284030,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -285255,13 +285335,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "mod",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -286446,6 +286526,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -286718,7 +286799,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -287856,13 +287937,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "net",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -289047,6 +289128,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -290347,13 +290429,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "net",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -291538,6 +291620,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -292842,13 +292925,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "net",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -294033,6 +294116,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -294305,7 +294389,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -295443,13 +295527,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "oauth2",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -296634,6 +296718,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -297934,13 +298019,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "oauth2",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -299125,6 +299210,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -300429,13 +300515,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "oauth2",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -301620,6 +301706,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -301892,7 +301979,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -302977,13 +303064,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "perf",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -304115,6 +304202,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -305362,13 +305450,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "perf",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -306500,6 +306588,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -307751,13 +307840,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "perf",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -308889,6 +308978,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -309161,7 +309251,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -310246,13 +310336,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "pkgsite",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -311384,6 +311474,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -312631,13 +312722,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "pkgsite",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -313769,6 +313860,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -315020,13 +315112,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "pkgsite",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -316158,6 +316250,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -316430,7 +316523,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -317515,13 +317608,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "pkgsite-metrics",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -318653,6 +318746,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -319900,13 +319994,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "pkgsite-metrics",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -321038,6 +321132,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -322289,13 +322384,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "pkgsite-metrics",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -323427,6 +323522,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -323699,7 +323795,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -324784,13 +324880,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "playground",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -325922,6 +326018,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -327169,13 +327266,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "playground",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -328307,6 +328404,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -329558,13 +329656,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "playground",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -330696,6 +330794,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -330968,7 +331067,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -332053,13 +332152,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "review",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -333191,6 +333290,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -334438,13 +334538,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "review",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -335576,6 +335676,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -336827,13 +336928,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "review",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -337965,6 +338066,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -338237,7 +338339,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -339375,13 +339477,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "sync",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -340566,6 +340668,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -341866,13 +341969,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "sync",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -343057,6 +343160,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -344361,13 +344465,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "sync",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -345552,6 +345656,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -345824,7 +345929,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -346962,13 +347067,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "sys",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -348153,6 +348258,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -349453,13 +349559,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "sys",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -350644,6 +350750,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -351948,13 +352055,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "sys",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -353139,6 +353246,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -353411,7 +353519,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -354549,13 +354657,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "telemetry",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -355740,6 +355848,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -357040,13 +357149,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "telemetry",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -358231,6 +358340,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -359535,13 +359645,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "telemetry",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -360726,6 +360836,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -360998,7 +361109,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -362136,13 +362247,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "term",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -363327,6 +363438,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -364627,13 +364739,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "term",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -365818,6 +365930,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -367122,13 +367235,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "term",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -368313,6 +368426,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -368585,7 +368699,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -369723,13 +369837,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "text",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -370914,6 +371028,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -372214,13 +372329,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "text",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -373405,6 +373520,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -374709,13 +374825,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "text",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -375900,6 +376016,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -376172,7 +376289,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -377310,13 +377427,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "time",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -378501,6 +378618,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -379801,13 +379919,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "time",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -380992,6 +381110,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -382296,13 +382415,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "time",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -383487,6 +383606,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -383759,7 +383879,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -385001,13 +385121,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "tools",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -386520,6 +386640,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -387820,13 +387941,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "tools",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -389339,6 +389460,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -390643,13 +390765,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "tools",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -392107,6 +392229,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -392379,7 +392502,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -393464,13 +393587,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "vuln",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -394602,6 +394725,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -395849,13 +395973,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "vuln",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -396987,6 +397111,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -398238,13 +398363,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "vuln",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -399376,6 +399501,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -399648,7 +399774,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -400733,13 +400859,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "vulndb",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -401871,6 +401997,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -403118,13 +403245,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "vulndb",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -404256,6 +404383,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -405507,13 +405635,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "vulndb",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -406645,6 +406773,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -406917,7 +407046,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -408002,13 +408131,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "website",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -409140,6 +409269,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -410387,13 +410517,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "website",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -411525,6 +411655,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -412776,13 +412907,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "website",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -413914,6 +414045,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -414186,7 +414318,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -415324,13 +415456,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "dl",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -416515,6 +416647,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -417815,13 +417948,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "dl",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -419006,6 +419139,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -420310,13 +420444,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "dl",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -421501,6 +421635,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -421773,7 +421908,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -422858,13 +422993,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "protobuf",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -423998,6 +424133,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -425245,13 +425381,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "protobuf",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -426385,6 +426521,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -427636,13 +427773,13 @@ buckets {
         '    "goos": "freebsd"'
         '  },'
         '  "is_google": false,'
-        '  "known_issue": 63482,'
         '  "mode": 0,'
         '  "project": "protobuf",'
         '  "target": {'
         '    "goarch": "riscv64",'
         '    "goos": "freebsd"'
         '  },'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -428776,6 +428913,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "linux"'
         '  },'
+        '  "test_timeout_scale": 2,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
@@ -429048,7 +429186,7 @@ buckets {
         '    "goarch": "riscv64",'
         '    "goos": "openbsd"'
         '  },'
-        '  "test_timeout_scale": 3,'
+        '  "test_timeout_scale": 4,'
         '  "tools_cache": "tools"'
         '}'
       priority: 30
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index d2e9f18638..834d69d3cb 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -56,6 +56,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/gotip-js-wasm"
     category: "js|wasm"
@@ -300,6 +304,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/go1.22-js-wasm"
     category: "js|wasm"
@@ -544,6 +552,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/go1.21-js-wasm"
     category: "js|wasm"
@@ -779,6 +791,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_arch-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_arch-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_arch-gotip-js-wasm"
     category: "js|wasm"
@@ -968,6 +984,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_arch-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_arch-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_arch-go1.22-js-wasm"
     category: "js|wasm"
@@ -1157,6 +1177,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_arch-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_arch-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_arch-go1.21-js-wasm"
     category: "js|wasm"
@@ -1342,6 +1366,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_benchmarks-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_benchmarks-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_benchmarks-gotip-js-wasm"
     category: "js|wasm"
@@ -1531,6 +1559,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_benchmarks-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_benchmarks-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_benchmarks-go1.22-js-wasm"
     category: "js|wasm"
@@ -1720,6 +1752,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_benchmarks-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_benchmarks-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_benchmarks-go1.21-js-wasm"
     category: "js|wasm"
@@ -2126,6 +2162,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_crypto-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_crypto-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_crypto-gotip-js-wasm"
     category: "js|wasm"
@@ -2315,6 +2355,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_crypto-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_crypto-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_crypto-go1.22-js-wasm"
     category: "js|wasm"
@@ -2504,6 +2548,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_crypto-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_crypto-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_crypto-go1.21-js-wasm"
     category: "js|wasm"
@@ -2689,6 +2737,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_debug-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_debug-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_debug-gotip-js-wasm"
     category: "js|wasm"
@@ -2878,6 +2930,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_debug-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_debug-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_debug-go1.22-js-wasm"
     category: "js|wasm"
@@ -3067,6 +3123,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_debug-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_debug-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_debug-go1.21-js-wasm"
     category: "js|wasm"
@@ -3252,6 +3312,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/z_dl-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/z_dl-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/z_dl-gotip-js-wasm"
     category: "js|wasm"
@@ -3441,6 +3505,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/z_dl-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/z_dl-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/z_dl-go1.22-js-wasm"
     category: "js|wasm"
@@ -3630,6 +3698,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/z_dl-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/z_dl-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/z_dl-go1.21-js-wasm"
     category: "js|wasm"
@@ -4132,6 +4204,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_image-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_image-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_image-gotip-js-wasm"
     category: "js|wasm"
@@ -4321,6 +4397,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_image-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_image-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_image-go1.22-js-wasm"
     category: "js|wasm"
@@ -4510,6 +4590,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_image-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_image-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_image-go1.21-js-wasm"
     category: "js|wasm"
@@ -4803,6 +4887,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_mod-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_mod-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_mod-gotip-js-wasm"
     category: "js|wasm"
@@ -4992,6 +5080,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_mod-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_mod-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_mod-go1.22-js-wasm"
     category: "js|wasm"
@@ -5181,6 +5273,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_mod-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_mod-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_mod-go1.21-js-wasm"
     category: "js|wasm"
@@ -5366,6 +5462,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_net-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_net-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_net-gotip-js-wasm"
     category: "js|wasm"
@@ -5555,6 +5655,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_net-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_net-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_net-go1.22-js-wasm"
     category: "js|wasm"
@@ -5744,6 +5848,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_net-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_net-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_net-go1.21-js-wasm"
     category: "js|wasm"
@@ -5929,6 +6037,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_oauth2-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_oauth2-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_oauth2-gotip-js-wasm"
     category: "js|wasm"
@@ -6118,6 +6230,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_oauth2-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_oauth2-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_oauth2-go1.22-js-wasm"
     category: "js|wasm"
@@ -6307,6 +6423,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_oauth2-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_oauth2-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_oauth2-go1.21-js-wasm"
     category: "js|wasm"
@@ -7705,6 +7825,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_sync-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_sync-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sync-gotip-js-wasm"
     category: "js|wasm"
@@ -7894,6 +8018,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_sync-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_sync-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sync-go1.22-js-wasm"
     category: "js|wasm"
@@ -8083,6 +8211,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_sync-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_sync-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sync-go1.21-js-wasm"
     category: "js|wasm"
@@ -8268,6 +8400,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_sys-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_sys-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sys-gotip-js-wasm"
     category: "js|wasm"
@@ -8457,6 +8593,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_sys-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_sys-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sys-go1.22-js-wasm"
     category: "js|wasm"
@@ -8646,6 +8786,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_sys-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_sys-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sys-go1.21-js-wasm"
     category: "js|wasm"
@@ -8831,6 +8975,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_telemetry-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_telemetry-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_telemetry-gotip-js-wasm"
     category: "js|wasm"
@@ -9020,6 +9168,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_telemetry-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_telemetry-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_telemetry-go1.22-js-wasm"
     category: "js|wasm"
@@ -9209,6 +9361,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_telemetry-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_telemetry-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_telemetry-go1.21-js-wasm"
     category: "js|wasm"
@@ -9394,6 +9550,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_term-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_term-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_term-gotip-js-wasm"
     category: "js|wasm"
@@ -9583,6 +9743,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_term-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_term-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_term-go1.22-js-wasm"
     category: "js|wasm"
@@ -9772,6 +9936,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_term-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_term-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_term-go1.21-js-wasm"
     category: "js|wasm"
@@ -9957,6 +10125,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_text-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_text-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_text-gotip-js-wasm"
     category: "js|wasm"
@@ -10146,6 +10318,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_text-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_text-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_text-go1.22-js-wasm"
     category: "js|wasm"
@@ -10335,6 +10511,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_text-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_text-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_text-go1.21-js-wasm"
     category: "js|wasm"
@@ -10520,6 +10700,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_time-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_time-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_time-gotip-js-wasm"
     category: "js|wasm"
@@ -10709,6 +10893,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_time-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_time-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_time-go1.22-js-wasm"
     category: "js|wasm"
@@ -10898,6 +11086,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_time-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_time-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_time-go1.21-js-wasm"
     category: "js|wasm"
@@ -11083,6 +11275,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_tools-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_tools-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_tools-gotip-js-wasm"
     category: "js|wasm"
@@ -11280,6 +11476,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_tools-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_tools-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_tools-go1.22-js-wasm"
     category: "js|wasm"
@@ -11474,6 +11674,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_tools-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_tools-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_tools-go1.21-js-wasm"
     category: "js|wasm"
@@ -12327,6 +12531,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_arch-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_arch-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_arch-gotip-js-wasm"
     category: "js|wasm"
@@ -12516,6 +12724,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_arch-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_arch-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_arch-go1.22-js-wasm"
     category: "js|wasm"
@@ -12705,6 +12917,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_arch-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_arch-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_arch-go1.21-js-wasm"
     category: "js|wasm"
@@ -12890,6 +13106,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_benchmarks-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_benchmarks-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_benchmarks-gotip-js-wasm"
     category: "js|wasm"
@@ -13079,6 +13299,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_benchmarks-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_benchmarks-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_benchmarks-go1.22-js-wasm"
     category: "js|wasm"
@@ -13268,6 +13492,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_benchmarks-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_benchmarks-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_benchmarks-go1.21-js-wasm"
     category: "js|wasm"
@@ -13674,6 +13902,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_crypto-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_crypto-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_crypto-gotip-js-wasm"
     category: "js|wasm"
@@ -13863,6 +14095,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_crypto-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_crypto-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_crypto-go1.22-js-wasm"
     category: "js|wasm"
@@ -14052,6 +14288,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_crypto-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_crypto-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_crypto-go1.21-js-wasm"
     category: "js|wasm"
@@ -14237,6 +14477,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_debug-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_debug-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_debug-gotip-js-wasm"
     category: "js|wasm"
@@ -14426,6 +14670,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_debug-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_debug-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_debug-go1.22-js-wasm"
     category: "js|wasm"
@@ -14615,6 +14863,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_debug-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_debug-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_debug-go1.21-js-wasm"
     category: "js|wasm"
@@ -14800,6 +15052,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/z_dl-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/z_dl-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/z_dl-gotip-js-wasm"
     category: "js|wasm"
@@ -14989,6 +15245,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/z_dl-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/z_dl-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/z_dl-go1.22-js-wasm"
     category: "js|wasm"
@@ -15178,6 +15438,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/z_dl-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/z_dl-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/z_dl-go1.21-js-wasm"
     category: "js|wasm"
@@ -15680,6 +15944,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_image-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_image-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_image-gotip-js-wasm"
     category: "js|wasm"
@@ -15869,6 +16137,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_image-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_image-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_image-go1.22-js-wasm"
     category: "js|wasm"
@@ -16058,6 +16330,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_image-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_image-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_image-go1.21-js-wasm"
     category: "js|wasm"
@@ -16351,6 +16627,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_mod-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_mod-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_mod-gotip-js-wasm"
     category: "js|wasm"
@@ -16540,6 +16820,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_mod-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_mod-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_mod-go1.22-js-wasm"
     category: "js|wasm"
@@ -16729,6 +17013,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_mod-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_mod-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_mod-go1.21-js-wasm"
     category: "js|wasm"
@@ -16914,6 +17202,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_net-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_net-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_net-gotip-js-wasm"
     category: "js|wasm"
@@ -17103,6 +17395,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_net-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_net-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_net-go1.22-js-wasm"
     category: "js|wasm"
@@ -17292,6 +17588,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_net-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_net-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_net-go1.21-js-wasm"
     category: "js|wasm"
@@ -17477,6 +17777,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_oauth2-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_oauth2-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_oauth2-gotip-js-wasm"
     category: "js|wasm"
@@ -17666,6 +17970,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_oauth2-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_oauth2-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_oauth2-go1.22-js-wasm"
     category: "js|wasm"
@@ -17855,6 +18163,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_oauth2-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_oauth2-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_oauth2-go1.21-js-wasm"
     category: "js|wasm"
@@ -19253,6 +19565,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_sync-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_sync-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sync-gotip-js-wasm"
     category: "js|wasm"
@@ -19442,6 +19758,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_sync-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_sync-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sync-go1.22-js-wasm"
     category: "js|wasm"
@@ -19631,6 +19951,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_sync-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_sync-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sync-go1.21-js-wasm"
     category: "js|wasm"
@@ -19816,6 +20140,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_sys-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_sys-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sys-gotip-js-wasm"
     category: "js|wasm"
@@ -20005,6 +20333,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_sys-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_sys-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sys-go1.22-js-wasm"
     category: "js|wasm"
@@ -20194,6 +20526,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_sys-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_sys-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sys-go1.21-js-wasm"
     category: "js|wasm"
@@ -20379,6 +20715,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_telemetry-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_telemetry-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_telemetry-gotip-js-wasm"
     category: "js|wasm"
@@ -20568,6 +20908,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_telemetry-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_telemetry-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_telemetry-go1.22-js-wasm"
     category: "js|wasm"
@@ -20757,6 +21101,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_telemetry-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_telemetry-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_telemetry-go1.21-js-wasm"
     category: "js|wasm"
@@ -20942,6 +21290,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_term-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_term-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_term-gotip-js-wasm"
     category: "js|wasm"
@@ -21131,6 +21483,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_term-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_term-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_term-go1.22-js-wasm"
     category: "js|wasm"
@@ -21320,6 +21676,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_term-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_term-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_term-go1.21-js-wasm"
     category: "js|wasm"
@@ -21505,6 +21865,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_text-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_text-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_text-gotip-js-wasm"
     category: "js|wasm"
@@ -21694,6 +22058,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_text-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_text-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_text-go1.22-js-wasm"
     category: "js|wasm"
@@ -21883,6 +22251,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_text-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_text-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_text-go1.21-js-wasm"
     category: "js|wasm"
@@ -22068,6 +22440,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_time-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_time-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_time-gotip-js-wasm"
     category: "js|wasm"
@@ -22257,6 +22633,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_time-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_time-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_time-go1.22-js-wasm"
     category: "js|wasm"
@@ -22446,6 +22826,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_time-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_time-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_time-go1.21-js-wasm"
     category: "js|wasm"
@@ -22631,6 +23015,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_tools-gotip-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_tools-gotip-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_tools-gotip-js-wasm"
     category: "js|wasm"
@@ -22828,6 +23216,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_tools-go1.22-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_tools-go1.22-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_tools-go1.22-js-wasm"
     category: "js|wasm"
@@ -23022,6 +23414,10 @@ consoles {
     name: "buildbucket/luci.golang.ci/x_tools-go1.21-darwin-arm64_13"
     category: "darwin|arm64_13"
   }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_tools-go1.21-freebsd-riscv64"
+    category: "freebsd|riscv64"
+  }
   builders {
     name: "buildbucket/luci.golang.ci/x_tools-go1.21-js-wasm"
     category: "js|wasm"
@@ -23877,10 +24273,6 @@ consoles {
     name: "buildbucket/luci.golang.ci/gotip-freebsd-arm64"
     category: "freebsd|arm64"
   }
-  builders {
-    name: "buildbucket/luci.golang.ci/gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/gotip-illumos-amd64"
     category: "illumos|amd64"
@@ -24014,11 +24406,6 @@ consoles {
         url: "https://go.dev/issue/67301"
         alt: "Known issue link for gotip-freebsd-arm64"
       }
-      links {
-        text: "gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for gotip-freebsd-riscv64"
-      }
       links {
         text: "gotip-illumos-amd64: go.dev/issue/67302"
         url: "https://go.dev/issue/67302"
@@ -24168,10 +24555,6 @@ consoles {
     name: "buildbucket/luci.golang.ci/go1.22-freebsd-arm64"
     category: "freebsd|arm64"
   }
-  builders {
-    name: "buildbucket/luci.golang.ci/go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/go1.22-illumos-amd64"
     category: "illumos|amd64"
@@ -24301,11 +24684,6 @@ consoles {
         url: "https://go.dev/issue/67301"
         alt: "Known issue link for go1.22-freebsd-arm64"
       }
-      links {
-        text: "go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for go1.22-freebsd-riscv64"
-      }
       links {
         text: "go1.22-illumos-amd64: go.dev/issue/67302"
         url: "https://go.dev/issue/67302"
@@ -24450,10 +24828,6 @@ consoles {
     name: "buildbucket/luci.golang.ci/go1.21-freebsd-arm64"
     category: "freebsd|arm64"
   }
-  builders {
-    name: "buildbucket/luci.golang.ci/go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/go1.21-illumos-amd64"
     category: "illumos|amd64"
@@ -24579,11 +24953,6 @@ consoles {
         url: "https://go.dev/issue/67301"
         alt: "Known issue link for go1.21-freebsd-arm64"
       }
-      links {
-        text: "go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for go1.21-freebsd-riscv64"
-      }
       links {
         text: "go1.21-illumos-amd64: go.dev/issue/67302"
         url: "https://go.dev/issue/67302"
@@ -24683,10 +25052,6 @@ consoles {
   repo_url: "https://go.googlesource.com/arch"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_arch-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_arch-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -24714,11 +25079,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_arch-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_arch-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_arch-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -24758,10 +25118,6 @@ consoles {
   repo_url: "https://go.googlesource.com/arch"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_arch-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_arch-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -24785,11 +25141,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_arch-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_arch-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_arch-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -24824,10 +25175,6 @@ consoles {
   repo_url: "https://go.googlesource.com/arch"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_arch-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_arch-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -24847,11 +25194,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_arch-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_arch-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_arch-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -24881,10 +25223,6 @@ consoles {
   repo_url: "https://go.googlesource.com/benchmarks"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_benchmarks-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_benchmarks-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -24912,11 +25250,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_benchmarks-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_benchmarks-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_benchmarks-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -24956,10 +25289,6 @@ consoles {
   repo_url: "https://go.googlesource.com/benchmarks"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_benchmarks-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_benchmarks-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -24983,11 +25312,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_benchmarks-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_benchmarks-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_benchmarks-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -25022,10 +25346,6 @@ consoles {
   repo_url: "https://go.googlesource.com/benchmarks"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_benchmarks-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_benchmarks-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -25045,11 +25365,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_benchmarks-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_benchmarks-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_benchmarks-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -25115,10 +25430,6 @@ consoles {
   repo_url: "https://go.googlesource.com/crypto"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_crypto-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_crypto-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -25146,11 +25457,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_crypto-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_crypto-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_crypto-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -25190,10 +25496,6 @@ consoles {
   repo_url: "https://go.googlesource.com/crypto"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_crypto-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_crypto-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -25217,11 +25519,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_crypto-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_crypto-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_crypto-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -25256,10 +25553,6 @@ consoles {
   repo_url: "https://go.googlesource.com/crypto"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_crypto-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_crypto-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -25279,11 +25572,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_crypto-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_crypto-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_crypto-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -25313,10 +25601,6 @@ consoles {
   repo_url: "https://go.googlesource.com/debug"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_debug-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_debug-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -25344,11 +25628,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_debug-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_debug-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_debug-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -25388,10 +25667,6 @@ consoles {
   repo_url: "https://go.googlesource.com/debug"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_debug-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_debug-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -25415,11 +25690,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_debug-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_debug-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_debug-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -25454,10 +25724,6 @@ consoles {
   repo_url: "https://go.googlesource.com/debug"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_debug-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_debug-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -25477,11 +25743,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_debug-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_debug-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_debug-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -25511,10 +25772,6 @@ consoles {
   repo_url: "https://go.googlesource.com/dl"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/z_dl-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/z_dl-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -25542,11 +25799,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "z_dl-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for z_dl-gotip-freebsd-riscv64"
-      }
       links {
         text: "z_dl-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -25586,10 +25838,6 @@ consoles {
   repo_url: "https://go.googlesource.com/dl"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/z_dl-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/z_dl-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -25613,11 +25861,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "z_dl-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for z_dl-go1.22-freebsd-riscv64"
-      }
       links {
         text: "z_dl-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -25652,10 +25895,6 @@ consoles {
   repo_url: "https://go.googlesource.com/dl"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/z_dl-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/z_dl-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -25675,11 +25914,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "z_dl-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for z_dl-go1.21-freebsd-riscv64"
-      }
       links {
         text: "z_dl-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -25745,10 +25979,6 @@ consoles {
   repo_url: "https://go.googlesource.com/image"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_image-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_image-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -25776,11 +26006,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_image-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_image-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_image-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -25820,10 +26045,6 @@ consoles {
   repo_url: "https://go.googlesource.com/image"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_image-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_image-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -25847,11 +26068,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_image-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_image-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_image-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -25886,10 +26102,6 @@ consoles {
   repo_url: "https://go.googlesource.com/image"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_image-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_image-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -25909,11 +26121,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_image-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_image-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_image-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -25979,10 +26186,6 @@ consoles {
   repo_url: "https://go.googlesource.com/mod"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_mod-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_mod-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -26010,11 +26213,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_mod-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_mod-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_mod-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -26054,10 +26252,6 @@ consoles {
   repo_url: "https://go.googlesource.com/mod"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_mod-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_mod-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -26081,11 +26275,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_mod-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_mod-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_mod-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -26120,10 +26309,6 @@ consoles {
   repo_url: "https://go.googlesource.com/mod"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_mod-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_mod-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -26143,11 +26328,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_mod-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_mod-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_mod-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -26177,10 +26357,6 @@ consoles {
   repo_url: "https://go.googlesource.com/net"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_net-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_net-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -26208,11 +26384,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_net-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_net-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_net-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -26252,10 +26423,6 @@ consoles {
   repo_url: "https://go.googlesource.com/net"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_net-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_net-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -26279,11 +26446,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_net-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_net-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_net-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -26318,10 +26480,6 @@ consoles {
   repo_url: "https://go.googlesource.com/net"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_net-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_net-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -26341,11 +26499,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_net-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_net-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_net-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -26375,10 +26528,6 @@ consoles {
   repo_url: "https://go.googlesource.com/oauth2"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_oauth2-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_oauth2-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -26406,11 +26555,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_oauth2-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_oauth2-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_oauth2-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -26450,10 +26594,6 @@ consoles {
   repo_url: "https://go.googlesource.com/oauth2"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_oauth2-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_oauth2-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -26477,11 +26617,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_oauth2-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_oauth2-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_oauth2-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -26516,10 +26651,6 @@ consoles {
   repo_url: "https://go.googlesource.com/oauth2"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_oauth2-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_oauth2-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -26539,11 +26670,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_oauth2-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_oauth2-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_oauth2-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -26789,10 +26915,6 @@ consoles {
   repo_url: "https://go.googlesource.com/sync"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_sync-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sync-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -26820,11 +26942,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_sync-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_sync-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_sync-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -26864,10 +26981,6 @@ consoles {
   repo_url: "https://go.googlesource.com/sync"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_sync-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sync-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -26891,11 +27004,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_sync-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_sync-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_sync-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -26930,10 +27038,6 @@ consoles {
   repo_url: "https://go.googlesource.com/sync"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_sync-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sync-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -26953,11 +27057,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_sync-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_sync-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_sync-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -26987,10 +27086,6 @@ consoles {
   repo_url: "https://go.googlesource.com/sys"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_sys-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sys-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -27018,11 +27113,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_sys-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_sys-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_sys-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -27062,10 +27152,6 @@ consoles {
   repo_url: "https://go.googlesource.com/sys"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_sys-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sys-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -27089,11 +27175,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_sys-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_sys-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_sys-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -27128,10 +27209,6 @@ consoles {
   repo_url: "https://go.googlesource.com/sys"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_sys-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sys-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -27151,11 +27228,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_sys-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_sys-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_sys-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -27185,10 +27257,6 @@ consoles {
   repo_url: "https://go.googlesource.com/telemetry"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_telemetry-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_telemetry-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -27216,11 +27284,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_telemetry-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_telemetry-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_telemetry-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -27260,10 +27323,6 @@ consoles {
   repo_url: "https://go.googlesource.com/telemetry"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_telemetry-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_telemetry-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -27287,11 +27346,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_telemetry-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_telemetry-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_telemetry-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -27326,10 +27380,6 @@ consoles {
   repo_url: "https://go.googlesource.com/telemetry"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_telemetry-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_telemetry-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -27349,11 +27399,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_telemetry-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_telemetry-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_telemetry-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -27383,10 +27428,6 @@ consoles {
   repo_url: "https://go.googlesource.com/term"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_term-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_term-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -27414,11 +27455,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_term-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_term-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_term-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -27458,10 +27494,6 @@ consoles {
   repo_url: "https://go.googlesource.com/term"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_term-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_term-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -27485,11 +27517,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_term-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_term-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_term-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -27524,10 +27551,6 @@ consoles {
   repo_url: "https://go.googlesource.com/term"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_term-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_term-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -27547,11 +27570,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_term-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_term-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_term-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -27581,10 +27599,6 @@ consoles {
   repo_url: "https://go.googlesource.com/text"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_text-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_text-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -27612,11 +27626,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_text-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_text-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_text-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -27656,10 +27665,6 @@ consoles {
   repo_url: "https://go.googlesource.com/text"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_text-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_text-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -27683,11 +27688,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_text-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_text-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_text-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -27722,10 +27722,6 @@ consoles {
   repo_url: "https://go.googlesource.com/text"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_text-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_text-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -27745,11 +27741,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_text-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_text-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_text-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -27779,10 +27770,6 @@ consoles {
   repo_url: "https://go.googlesource.com/time"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_time-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_time-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -27810,11 +27797,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_time-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_time-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_time-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -27854,10 +27836,6 @@ consoles {
   repo_url: "https://go.googlesource.com/time"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_time-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_time-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -27881,11 +27859,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_time-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_time-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_time-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -27920,10 +27893,6 @@ consoles {
   repo_url: "https://go.googlesource.com/time"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_time-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_time-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -27943,11 +27912,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_time-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_time-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_time-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -27977,10 +27941,6 @@ consoles {
   repo_url: "https://go.googlesource.com/tools"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_tools-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_tools-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -28008,11 +27968,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_tools-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_tools-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_tools-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -28052,10 +28007,6 @@ consoles {
   repo_url: "https://go.googlesource.com/tools"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_tools-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_tools-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -28079,11 +28030,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_tools-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_tools-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_tools-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -28118,10 +28064,6 @@ consoles {
   repo_url: "https://go.googlesource.com/tools"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_tools-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_tools-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -28141,11 +28083,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_tools-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_tools-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_tools-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -28283,10 +28220,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_arch-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_arch-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -28314,11 +28247,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_arch-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_arch-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_arch-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -28358,10 +28286,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.22"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_arch-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_arch-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -28385,11 +28309,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_arch-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_arch-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_arch-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -28424,10 +28343,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.21"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_arch-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_arch-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -28447,11 +28362,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_arch-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_arch-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_arch-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -28481,10 +28391,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_benchmarks-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_benchmarks-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -28512,11 +28418,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_benchmarks-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_benchmarks-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_benchmarks-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -28556,10 +28457,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.22"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_benchmarks-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_benchmarks-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -28583,11 +28480,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_benchmarks-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_benchmarks-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_benchmarks-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -28622,10 +28514,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.21"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_benchmarks-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_benchmarks-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -28645,11 +28533,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_benchmarks-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_benchmarks-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_benchmarks-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -28715,10 +28598,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_crypto-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_crypto-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -28746,11 +28625,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_crypto-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_crypto-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_crypto-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -28790,10 +28664,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.22"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_crypto-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_crypto-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -28817,11 +28687,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_crypto-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_crypto-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_crypto-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -28856,10 +28721,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.21"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_crypto-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_crypto-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -28879,11 +28740,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_crypto-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_crypto-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_crypto-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -28913,10 +28769,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_debug-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_debug-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -28944,11 +28796,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_debug-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_debug-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_debug-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -28988,10 +28835,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.22"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_debug-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_debug-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -29015,11 +28858,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_debug-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_debug-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_debug-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -29054,10 +28892,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.21"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_debug-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_debug-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -29077,11 +28911,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_debug-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_debug-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_debug-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -29111,10 +28940,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/z_dl-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/z_dl-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -29142,11 +28967,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "z_dl-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for z_dl-gotip-freebsd-riscv64"
-      }
       links {
         text: "z_dl-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -29186,10 +29006,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.22"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/z_dl-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/z_dl-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -29213,11 +29029,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "z_dl-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for z_dl-go1.22-freebsd-riscv64"
-      }
       links {
         text: "z_dl-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -29252,10 +29063,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.21"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/z_dl-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/z_dl-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -29275,11 +29082,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "z_dl-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for z_dl-go1.21-freebsd-riscv64"
-      }
       links {
         text: "z_dl-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -29345,10 +29147,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_image-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_image-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -29376,11 +29174,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_image-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_image-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_image-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -29420,10 +29213,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.22"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_image-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_image-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -29447,11 +29236,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_image-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_image-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_image-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -29486,10 +29270,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.21"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_image-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_image-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -29509,11 +29289,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_image-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_image-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_image-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -29579,10 +29354,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_mod-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_mod-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -29610,11 +29381,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_mod-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_mod-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_mod-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -29654,10 +29420,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.22"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_mod-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_mod-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -29681,11 +29443,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_mod-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_mod-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_mod-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -29720,10 +29477,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.21"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_mod-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_mod-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -29743,11 +29496,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_mod-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_mod-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_mod-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -29777,10 +29525,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_net-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_net-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -29808,11 +29552,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_net-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_net-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_net-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -29852,10 +29591,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.22"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_net-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_net-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -29879,11 +29614,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_net-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_net-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_net-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -29918,10 +29648,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.21"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_net-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_net-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -29941,11 +29667,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_net-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_net-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_net-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -29975,10 +29696,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_oauth2-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_oauth2-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -30006,11 +29723,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_oauth2-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_oauth2-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_oauth2-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -30050,10 +29762,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.22"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_oauth2-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_oauth2-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -30077,11 +29785,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_oauth2-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_oauth2-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_oauth2-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -30116,10 +29819,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.21"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_oauth2-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_oauth2-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -30139,11 +29838,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_oauth2-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_oauth2-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_oauth2-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -30389,10 +30083,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_sync-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sync-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -30420,11 +30110,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_sync-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_sync-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_sync-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -30464,10 +30149,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.22"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_sync-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sync-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -30491,11 +30172,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_sync-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_sync-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_sync-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -30530,10 +30206,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.21"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_sync-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sync-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -30553,11 +30225,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_sync-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_sync-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_sync-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -30587,10 +30254,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_sys-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sys-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -30618,11 +30281,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_sys-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_sys-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_sys-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -30662,10 +30320,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.22"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_sys-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sys-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -30689,11 +30343,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_sys-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_sys-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_sys-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -30728,10 +30377,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.21"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_sys-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_sys-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -30751,11 +30396,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_sys-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_sys-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_sys-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -30785,10 +30425,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_telemetry-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_telemetry-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -30816,11 +30452,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_telemetry-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_telemetry-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_telemetry-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -30860,10 +30491,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.22"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_telemetry-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_telemetry-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -30887,11 +30514,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_telemetry-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_telemetry-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_telemetry-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -30926,10 +30548,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.21"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_telemetry-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_telemetry-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -30949,11 +30567,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_telemetry-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_telemetry-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_telemetry-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -30983,10 +30596,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_term-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_term-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -31014,11 +30623,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_term-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_term-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_term-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -31058,10 +30662,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.22"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_term-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_term-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -31085,11 +30685,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_term-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_term-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_term-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -31124,10 +30719,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.21"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_term-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_term-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -31147,11 +30738,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_term-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_term-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_term-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -31181,10 +30767,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_text-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_text-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -31212,11 +30794,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_text-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_text-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_text-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -31256,10 +30833,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.22"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_text-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_text-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -31283,11 +30856,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_text-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_text-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_text-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -31322,10 +30890,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.21"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_text-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_text-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -31345,11 +30909,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_text-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_text-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_text-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -31379,10 +30938,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_time-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_time-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -31410,11 +30965,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_time-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_time-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_time-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -31454,10 +31004,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.22"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_time-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_time-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -31481,11 +31027,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_time-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_time-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_time-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -31520,10 +31061,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.21"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_time-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_time-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -31543,11 +31080,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_time-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_time-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_time-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -31577,10 +31109,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_tools-gotip-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_tools-gotip-netbsd-arm"
     category: "netbsd|arm"
@@ -31608,11 +31136,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_tools-gotip-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_tools-gotip-freebsd-riscv64"
-      }
       links {
         text: "x_tools-gotip-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -31652,10 +31175,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.22"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_tools-go1.22-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_tools-go1.22-netbsd-arm"
     category: "netbsd|arm"
@@ -31679,11 +31198,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_tools-go1.22-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_tools-go1.22-freebsd-riscv64"
-      }
       links {
         text: "x_tools-go1.22-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -31718,10 +31232,6 @@ consoles {
   repo_url: "https://go.googlesource.com/go"
   refs: "regexp:refs/heads/release-branch.go1.21"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.golang.ci/x_tools-go1.21-freebsd-riscv64"
-    category: "freebsd|riscv64"
-  }
   builders {
     name: "buildbucket/luci.golang.ci/x_tools-go1.21-netbsd-arm"
     category: "netbsd|arm"
@@ -31741,11 +31251,6 @@ consoles {
   header {
     links {
       name: "Known issues"
-      links {
-        text: "x_tools-go1.21-freebsd-riscv64: go.dev/issue/63482"
-        url: "https://go.dev/issue/63482"
-        alt: "Known issue link for x_tools-go1.21-freebsd-riscv64"
-      }
       links {
         text: "x_tools-go1.21-netbsd-arm: go.dev/issue/63698"
         url: "https://go.dev/issue/63698"
@@ -33876,6 +33381,164 @@ consoles {
   }
   builder_view_only: true
 }
+consoles {
+  id: "port-freebsd-riscv64"
+  name: "all freebsd/riscv64"
+  builders {
+    name: "buildbucket/luci.golang.ci/gotip-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/go1.22-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/go1.21-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_arch-gotip-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_arch-go1.22-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_arch-go1.21-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_benchmarks-gotip-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_benchmarks-go1.22-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_benchmarks-go1.21-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_crypto-gotip-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_crypto-go1.22-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_crypto-go1.21-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_debug-gotip-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_debug-go1.22-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_debug-go1.21-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/z_dl-gotip-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/z_dl-go1.22-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/z_dl-go1.21-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_image-gotip-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_image-go1.22-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_image-go1.21-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_mod-gotip-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_mod-go1.22-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_mod-go1.21-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_net-gotip-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_net-go1.22-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_net-go1.21-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_oauth2-gotip-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_oauth2-go1.22-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_oauth2-go1.21-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_sync-gotip-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_sync-go1.22-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_sync-go1.21-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_sys-gotip-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_sys-go1.22-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_sys-go1.21-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_telemetry-gotip-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_telemetry-go1.22-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_telemetry-go1.21-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_term-gotip-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_term-go1.22-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_term-go1.21-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_text-gotip-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_text-go1.22-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_text-go1.21-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_time-gotip-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_time-go1.22-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_time-go1.21-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_tools-gotip-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_tools-go1.22-freebsd-riscv64"
+  }
+  builders {
+    name: "buildbucket/luci.golang.ci/x_tools-go1.21-freebsd-riscv64"
+  }
+  builder_view_only: true
+}
 consoles {
   id: "port-js-wasm"
   name: "all js/wasm"
@@ -40081,164 +39744,6 @@ consoles {
   }
   builder_view_only: true
 }
-consoles {
-  id: "port-freebsd-riscv64"
-  name: "all freebsd/riscv64"
-  builders {
-    name: "buildbucket/luci.golang.ci/gotip-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/go1.22-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/go1.21-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_arch-gotip-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_arch-go1.22-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_arch-go1.21-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_benchmarks-gotip-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_benchmarks-go1.22-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_benchmarks-go1.21-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_crypto-gotip-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_crypto-go1.22-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_crypto-go1.21-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_debug-gotip-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_debug-go1.22-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_debug-go1.21-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/z_dl-gotip-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/z_dl-go1.22-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/z_dl-go1.21-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_image-gotip-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_image-go1.22-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_image-go1.21-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_mod-gotip-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_mod-go1.22-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_mod-go1.21-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_net-gotip-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_net-go1.22-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_net-go1.21-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_oauth2-gotip-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_oauth2-go1.22-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_oauth2-go1.21-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_sync-gotip-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_sync-go1.22-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_sync-go1.21-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_sys-gotip-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_sys-go1.22-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_sys-go1.21-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_telemetry-gotip-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_telemetry-go1.22-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_telemetry-go1.21-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_term-gotip-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_term-go1.22-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_term-go1.21-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_text-gotip-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_text-go1.22-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_text-go1.21-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_time-gotip-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_time-go1.22-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_time-go1.21-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_tools-gotip-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_tools-go1.22-freebsd-riscv64"
-  }
-  builders {
-    name: "buildbucket/luci.golang.ci/x_tools-go1.21-freebsd-riscv64"
-  }
-  builder_view_only: true
-}
 consoles {
   id: "port-illumos-amd64"
   name: "all illumos/amd64"
diff --git a/main.star b/main.star
index 9213137a53..dc0718dd8e 100755
--- a/main.star
+++ b/main.star
@@ -332,17 +332,19 @@ HOST_NOTIFIERS = {
 # factor. It also affects the decision of whether to include a builder in
 # presubmit testing by default (slow high-capacity hosts aren't included).
 SLOW_HOSTS = {
+    "freebsd-riscv64": 4,
     "linux-ppc64_power10": 2,
     "linux-ppc64_power8": 2,
     "linux-ppc64le_power10": 2,
     "linux-ppc64le_power8": 2,
     "linux-ppc64le_power9": 2,
+    "linux-riscv64": 2,
     "netbsd-arm64": 2,
     "openbsd-amd64": 2,
     "openbsd-arm": 5,
     "openbsd-arm64": 5,
     "openbsd-ppc64": 2,
-    "openbsd-riscv64": 3,
+    "openbsd-riscv64": 4,
 }
 
 # host_timeout_scale returns the default test timeout scale for a given host.
@@ -478,7 +480,6 @@ def known_issue(issue_number, skip_x_repos = False):
     )
 
 KNOWN_ISSUE_BUILDER_TYPES = {
-    "freebsd-riscv64": known_issue(issue_number = 63482),
     "netbsd-arm": known_issue(issue_number = 63698),
     "openbsd-ppc64": known_issue(issue_number = 63480),
     "openbsd-riscv64": known_issue(issue_number = 64176),