sweet: upgrade cockroachdb to v25.2.0 and re-enable

mknyszek · gopherbot · commit 34397ba136b4 · 2025-06-06T21:09:17.000-07:00
This is a new release. It looks OK to me locally, so perhaps whatever was ailing us is now gone. I hope. Famous last words but, it's a flaky failure, so I think we might just have to try. Fixes golang/go#73474. Change-Id: I5153f428037813e80c4eefca563f95cbb500938a Reviewed-on: https://go-review.googlesource.com/c/benchmarks/+/679755 Reviewed-by: Carlos Amedee <carlos@golang.org> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Auto-Submit: Michael Knyszek <mknyszek@google.com>
diff --git a/sweet/cmd/sweet/benchmark.go b/sweet/cmd/sweet/benchmark.go
@@ -105,16 +105,12 @@ var benchmarkGroups = func() map[string][]*benchmark {
 
 	m["default"] = []*benchmark{
 		allBenchmarksMap["bleve-index"],
+		allBenchmarksMap["cockroachdb"],
 		allBenchmarksMap["etcd"],
 		allBenchmarksMap["esbuild"],
 		allBenchmarksMap["go-build"],
 		allBenchmarksMap["gopher-lua"],
 	}
-	// TODO(go.dev/issue/73474): cockroachdb has a flaky benchmark in the CockroachDB tree
-	// we can benchmark against (anything including master/6819a3e60849345808aa88932b5f52c43f329979).
-	// Disable until CockroachDB upstream is fixed.
-	// m["default"] = append(m["default"], allBenchmarksMap["cockroachdb"])
-
 	// TODO(go.dev/issue/72042): gVisor is broken at Go tip as of
 	// https://go.dev/cl/652276 due to unsafe dependence on field offsets.
 	// Disable until gVisor upstream is fixed.
diff --git a/sweet/harnesses/cockroachdb.go b/sweet/harnesses/cockroachdb.go
@@ -28,14 +28,13 @@ func (h CockroachDB) CheckPrerequisites() error {
 }
 
 func (h CockroachDB) Get(gcfg *common.GetConfig) error {
-	// Build against a commit that includes https://github.com/cockroachdb/cockroach/pull/125588.
 	// Recursive clone the repo as we need certain submodules, i.e.
 	// PROJ, for the build to work.
 	return gitRecursiveCloneToCommit(
 		gcfg.SrcDir,
 		"https://github.com/cockroachdb/cockroach",
 		"master",
-		"c4a0d997e0da6ba3ebede61b791607aa452b9bbc",
+		"de6ca871fb4b0536d308d6468ab1f57a0fe83cee", // v25.2.0
 	)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -28,14 +28,13 @@ func (h CockroachDB) CheckPrerequisites() error {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`func (h CockroachDB) Get(gcfg *common.GetConfig) error {`
`31`		`- // Build against a commit that includes https://github.com/cockroachdb/cockroach/pull/125588.`
`32`	`31`	`// Recursive clone the repo as we need certain submodules, i.e.`
`33`	`32`	`// PROJ, for the build to work.`
`34`	`33`	`return gitRecursiveCloneToCommit(`
`35`	`34`	`gcfg.SrcDir,`
`36`	`35`	`"https://github.com/cockroachdb/cockroach",`
`37`	`36`	`"master",`
`38`		`- "c4a0d997e0da6ba3ebede61b791607aa452b9bbc",`
	`37`	`+ "de6ca871fb4b0536d308d6468ab1f57a0fe83cee", // v25.2.0`
`39`	`38`	`)`
`40`	`39`	`}`
`41`	`40`