From 5877195c838164469cda94f283a2338e687d88e4 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Mon, 21 Oct 2019 15:00:32 +0000 Subject: [PATCH] dashboard: update Dragonfly tip policy for ABI change, add release builder From https://github.com/golang/go/issues/34958#issuecomment-543852995 : > Go's DragonFly support policy is that we support the latest stable > release primarily, but also try to keep DragonFly master passing, in > prep for it to become the latest stable release. > > But that does mean we need one more builder at the moment. Updates golang/go#34958 Updates golang/go#23060 Change-Id: I84be7c64eac593dee2252c397f9529deea13605a Reviewed-on: https://go-review.googlesource.com/c/build/+/202478 Reviewed-by: Tobias Klauser Reviewed-by: Bryan C. Mills --- dashboard/builders.go | 18 +++++++++++++++++- dashboard/builders_test.go | 8 ++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dashboard/builders.go b/dashboard/builders.go index e643fe6300..d084f00084 100644 --- a/dashboard/builders.go +++ b/dashboard/builders.go @@ -331,6 +331,16 @@ var Hosts = map[string]*HostConfig{ env: []string{"GOROOT_BOOTSTRAP=/usr/pkg/go112"}, OwnerGithub: "bsiegert", }, + // Our DragonFly builder doesn't yet run on GCE + // (golang.org/issue/23060), so @bradfitz currently runs the + // release version at home, and @tdfbsd runs one somewhere + // running the bleeding edge version. + "host-dragonfly-amd64-bradfitz": &HostConfig{ + IsReverse: true, + ExpectNum: 1, + env: []string{"GOROOT_BOOTSTRAP=/usr/local/go"}, + OwnerGithub: "bradfitz", + }, "host-dragonfly-amd64-tdfbsd": &HostConfig{ IsReverse: true, ExpectNum: 1, @@ -2214,9 +2224,15 @@ func init() { // (https://golang.org/issue/32836) return false } - return defaultBuildsRepoPolicy(repo, branch, goBranch) + return atLeastGo1(goBranch, 14) && defaultBuildsRepoPolicy(repo, branch, goBranch) }, }) + addBuilder(BuildConfig{ + Name: "dragonfly-amd64-5_6", + HostType: "host-dragonfly-amd64-bradfitz", + shouldRunDistTest: noTestDir, + SkipSnapshot: true, + }) addBuilder(BuildConfig{ Name: "freebsd-arm-paulzhol", HostType: "host-freebsd-arm-paulzhol", diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go index e7a7699444..51f4f5fc22 100644 --- a/dashboard/builders_test.go +++ b/dashboard/builders_test.go @@ -524,6 +524,14 @@ func TestBuilderConfig(t *testing.T) { // that'll never be fixed. {b("freebsd-386-11_2@go1.11", "net"), none}, {b("freebsd-386-12_0@go1.11", "net"), none}, + + {b("dragonfly-amd64", "go"), onlyPost}, + {b("dragonfly-amd64", "net"), onlyPost}, + {b("dragonfly-amd64@go1.13", "net"), none}, // Dragonfly ABI changes only supported by Go 1.14+ + {b("dragonfly-amd64@go1.13", "go"), none}, // Dragonfly ABI changes only supported by Go 1.14+ + {b("dragonfly-amd64-5_6", "go"), onlyPost}, + {b("dragonfly-amd64-5_6", "net"), onlyPost}, + {b("dragonfly-amd64-5_6@go1.13", "net"), onlyPost}, } for _, tt := range tests { t.Run(tt.br.testName, func(t *testing.T) {