Merge #149342

149342: roachtest: disable cluster reuse for sysbench/postgres* tests r=tbg a=DarrylWong

Installing postgres creates a lot of directories that are not properly cleaned up by a cluster wipe. Disable cluster reuse
to avoid any side effects.

Release note: none
Fixes: #149127
Fixes: #149126
Fixes: #149128

Co-authored-by: DarrylWong <[email protected]>

Author: craig[bot]

pkg/cmd/roachtest/tests/sysbench.go

@@ -406,7 +406,7 @@ func registerSysbench(r registry.Registry) {
 				benchname += opts.extra.nameSuffix
 			}
 
-			spec := registry.TestSpec{
+			crdbSpec := registry.TestSpec{
 				Name:                      fmt.Sprintf("%s/%s/nodes=%d/cpu=%d/conc=%d", benchname, w, d.n, d.cpus, conc),
 				Benchmark:                 true,
 				Owner:                     registry.OwnerTestEng,
@@ -418,15 +418,19 @@ func registerSysbench(r registry.Registry) {
 					runSysbench(ctx, t, c, opts)
 				},
 			}
-			r.Add(spec)
+			r.Add(crdbSpec)
 
 			// Add a variant of the single-node tests that uses PostgreSQL instead of CockroachDB.
 			if d.n == 1 {
 				pgOpts := opts
 				pgOpts.usePostgres = true
-				pgSpec := spec
+				pgSpec := crdbSpec
 				pgSpec.Name = fmt.Sprintf("%s/%s/postgres/cpu=%d/conc=%d", benchname, w, d.cpus, conc)
 				pgSpec.Suites = registry.Suites(registry.Weekly)
+				// Postgres installation creates a lot of directories not cleaned up by
+				// cluster wipe. To avoid side effects on subsequent postgres sysbench
+				// runs, don't reuse the cluster.
+				pgSpec.Cluster.ReusePolicy = spec.ReusePolicyNone{}
 				pgSpec.TestSelectionOptOutSuites = registry.Suites(registry.Weekly)
 				pgSpec.Run = func(ctx context.Context, t test.Test, c cluster.Cluster) {
 					runSysbench(ctx, t, c, pgOpts)