Merge #51807 #51832

51807: testcluster: don't create two stoppers in StartTestCluster r=nvanbenschoten a=nvanbenschoten

This looks harmless because the first stopper was never actually used, but it was caught by #51413.

51832: dump: fix dump-backwards-compatibility remote roachtest r=pbardea a=pbardea

This commit changes the execution of the cockroach binary from
`cockroach` to `./cockroach`. This follows how other CLI roachtests run
the binary. Before this commit, this test would fail when run on a GCE
roachprod cluster, it now passes.

Release note: None

Co-authored-by: Nathan VanBenschoten <[email protected]>
Co-authored-by: Paul Bardea <[email protected]>

pkg/cmd/roachtest/dump.go

@@ -62,7 +62,7 @@ func runDump(nodes nodeListOption, mainVersion, expected string) versionStep {
 	return func(ctx context.Context, t *test, u *versionUpgradeTest) {
 		// Put the new version of Cockroach onto the node.
 		u.uploadVersion(ctx, t, nodes, mainVersion)
-		raw, err := u.c.RunWithBuffer(ctx, t.logger(), nodes, `cockroach dump --insecure d`)
+		raw, err := u.c.RunWithBuffer(ctx, t.logger(), nodes, `./cockroach dump --insecure d`)
 		if err != nil {
 			t.Fatal(err)
 		}

pkg/testutils/testcluster/testcluster.go

@@ -141,7 +141,6 @@ func StartTestCluster(t testing.TB, nodes int, args base.TestClusterArgs) *TestC
 		stopper:         stop.NewStopper(),
 		replicationMode: args.ReplicationMode,
 	}
-	tc.stopper = stop.NewStopper()
 
 	// Check if any of the args have a locality set.
 	noLocalities := true