From c6075b801909248609d477d56c4dc80e2ef067d6 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Fri, 22 Jul 2022 12:20:28 -0400 Subject: [PATCH] dashboard: use dragonfly on GCE for dragonfly-amd64 builds Now that we have DragonflyBSD on GCE, use it instead of the single reverse builder provided by the DragonflyBSD team. A full 'debugnewvm' all.bash run, including starting the VM, takes 12 minutes, which is rather a lot faster than the current machine. Fixes golang/go#23060. Fixes golang/go#45215. Fixes golang/go#53577. Change-Id: Icb6e5cfde2e8c7ff16fa03cbc0eb833b275180ef Reviewed-on: https://go-review.googlesource.com/c/build/+/419084 Run-TryBot: Russ Cox TryBot-Result: Gopher Robot Reviewed-by: Heschi Kreinick Auto-Submit: Russ Cox --- dashboard/builders.go | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dashboard/builders.go b/dashboard/builders.go index 2365b3b2c5..d842615506 100644 --- a/dashboard/builders.go +++ b/dashboard/builders.go @@ -217,13 +217,12 @@ var Hosts = map[string]*HostConfig{ }, SSHUsername: "gopher", }, - "host-dragonfly-amd64-master": { - IsReverse: true, - ExpectNum: 1, - Notes: "DragonFly BSD master, run by DragonFly team", - env: []string{"GOROOT_BOOTSTRAP=/usr/local/go"}, - SSHUsername: "root", - Owners: []*gophers.Person{gh("tuxillo")}, + "host-dragonfly-amd64-622": { + Notes: "DragonFly BSD 6.2.2 on GCE, built from build/env/dragonfly-amd64", + VMImage: "dragonfly-amd64-622", + buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.dragonfly-amd64", + goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-dragonfly-amd64-go1.17.12.tar.gz", + SSHUsername: "root", }, "host-freebsd-amd64-11_4": { VMImage: "freebsd-amd64-114", @@ -2697,13 +2696,9 @@ func init() { tryOnly: true, }) addBuilder(BuildConfig{ - Name: "dragonfly-amd64", - HostType: "host-dragonfly-amd64-master", - Notes: "DragonFly BSD master, run by DragonFly team", - distTestAdjust: noTestDirAndNoReboot, - env: []string{"GO_TEST_TIMEOUT_SCALE=2"}, // see golang.org/issue/45216 - SkipSnapshot: true, - KnownIssues: []int{53577}, + Name: "dragonfly-amd64", + HostType: "host-dragonfly-amd64-622", + Notes: "DragonFly BSD 6.2.2, running on GCE", }) addBuilder(BuildConfig{ Name: "freebsd-arm-paulzhol",