Merge #93792 #93899

93792: builtins: make it easier to add builtins r=jordanlewis a=jordanlewis It was very annoying to have to find new slots for new builtins, and merge conflicts were irritating because they don't actually cause merge conflicts - instead just fails CI later. Now, we store the signatures in a sorted list. If 2 people race to make builtins, true merge conflicts will be generated which are much easier to resolve than having to wait until CI time. Epic: None Release note: None 93899: kvnemesis: keep artifacts only on failure r=erikgrinaker a=tbg The nightly runs amassed lots of artifacts because they run many invocations of kvnemesis in one go. We only need artifacts on failure. Epic: none Release note: None Co-authored-by: Jordan Lewis <[email protected]> Co-authored-by: Tobias Grieger <[email protected]>
cockroachdb · Dec 19, 2022 · 58739fe · 58739fe
3 parents c88b6ea + e66c9a3 + 1175940
commit 58739fe
Show file tree

Hide file tree

Showing 2 changed files with 2,049 additions and 2,018 deletions.
diff --git a/pkg/kv/kvnemesis/kvnemesis_test.go b/pkg/kv/kvnemesis/kvnemesis_test.go
@@ -108,10 +108,18 @@ type tBridge struct {
 }
 
 func newTBridge(t *testing.T) *tBridge {
+	// NB: we're not using t.TempDir() because we want these to survive
+	// on failure.
 	td, err := os.MkdirTemp("", "kvnemesis")
 	if err != nil {
 		td = os.TempDir()
 	}
+	t.Cleanup(func() {
+		if t.Failed() {
+			return
+		}
+		_ = os.RemoveAll(td)
+	})
 	t.Logf("kvnemesis logging to %s", td)
 	return &tBridge{
 		ti: t,