cli: don't cpu profile local cluster in zip test

We were CPU profiling two servers in parallel, but they were both
running in-mem in the same process, so only one of them could
succeed. This introduces randomness, which is undesired.

Remove all nonzero cpu profiling durations from the multi-node zip tests
and put a nonzero one into the single-node one.

Fixes #51538

Release justification: test flake fix
Release note: None

pkg/cli/testdata/zip/partial1

@@ -1,6 +1,6 @@
 zip
 ----
-debug zip --cpu-profile-duration=1s /dev/null
+debug zip --cpu-profile-duration=0s /dev/null
 establishing RPC connection to ...
 retrieving the node status to get the SQL address...
 using SQL address: ...
@@ -26,12 +26,6 @@ retrieving SQL data for crdb_internal.partitions... writing: debug/crdb_internal
 retrieving SQL data for crdb_internal.zones... writing: debug/crdb_internal.zones.txt
 requesting nodes... writing: debug/nodes.json
 requesting liveness... writing: debug/liveness.json
-requesting CPU profiles... ok
-writing: debug/nodes/1/cpu.pprof
-writing: debug/nodes/2/cpu.pprof.err.txt
-  ^- resulted in ...
-writing: debug/nodes/3/cpu.pprof.err.txt
-  ^- resulted in ...
 writing: debug/nodes/1/status.json
 using SQL connection URL for node 1: postgresql://...
 retrieving SQL data for crdb_internal.feature_usage... writing: debug/nodes/1/crdb_internal.feature_usage.txt

pkg/cli/testdata/zip/partial1_excluded

@@ -1,6 +1,6 @@
 zip
 ----
-debug zip /dev/null --exclude-nodes=2 --cpu-profile-duration=1s
+debug zip /dev/null --exclude-nodes=2 --cpu-profile-duration=0
 establishing RPC connection to ...
 retrieving the node status to get the SQL address...
 using SQL address: ...
@@ -26,12 +26,6 @@ retrieving SQL data for crdb_internal.partitions... writing: debug/crdb_internal
 retrieving SQL data for crdb_internal.zones... writing: debug/crdb_internal.zones.txt
 requesting nodes... writing: debug/nodes.json
 requesting liveness... writing: debug/liveness.json
-requesting CPU profiles... ok
-writing: debug/nodes/1/cpu.pprof
-writing: debug/nodes/2/cpu.pprof.err.txt
-  ^- resulted in ...
-writing: debug/nodes/3/cpu.pprof.err.txt
-  ^- resulted in ...
 writing: debug/nodes/1/status.json
 using SQL connection URL for node 1: postgresql://...
 retrieving SQL data for crdb_internal.feature_usage... writing: debug/nodes/1/crdb_internal.feature_usage.txt

pkg/cli/testdata/zip/testzip

@@ -1,6 +1,6 @@
 zip
 ----
-debug zip --cpu-profile-duration=0 /dev/null
+debug zip --cpu-profile-duration=1s /dev/null
 establishing RPC connection to ...
 retrieving the node status to get the SQL address...
 using SQL address: ...
@@ -26,6 +26,8 @@ retrieving SQL data for crdb_internal.partitions... writing: debug/crdb_internal
 retrieving SQL data for crdb_internal.zones... writing: debug/crdb_internal.zones.txt
 requesting nodes... writing: debug/nodes.json
 requesting liveness... writing: debug/liveness.json
+requesting CPU profiles... ok
+writing: debug/nodes/1/cpu.pprof
 writing: debug/nodes/1/status.json
 using SQL connection URL for node 1: postgresql://...
 retrieving SQL data for crdb_internal.feature_usage... writing: debug/nodes/1/crdb_internal.feature_usage.txt

pkg/cli/zip_test.go

@@ -121,7 +121,7 @@ func TestZip(t *testing.T) {
 	})
 	defer c.cleanup()
 
-	out, err := c.RunWithCapture("debug zip --cpu-profile-duration=0 " + os.DevNull)
+	out, err := c.RunWithCapture("debug zip --cpu-profile-duration=1s " + os.DevNull)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -283,8 +283,6 @@ func TestPartialZip(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	skip.WithIssue(t, 51538)
-
 	// We want a low timeout so that the test doesn't take forever;
 	// however low timeouts make race runs flaky with false positives.
 	skip.UnderShort(t)
@@ -308,9 +306,7 @@ func TestPartialZip(t *testing.T) {
 	defer func(prevStderr *os.File) { stderr = prevStderr }(stderr)
 	stderr = os.Stdout
 
-	// NB: we spend a second profiling here to make sure it actually tries the
-	// down nodes (and fails only there, succeeding on the available node).
-	out, err := c.RunWithCapture("debug zip --cpu-profile-duration=1s " + os.DevNull)
+	out, err := c.RunWithCapture("debug zip --cpu-profile-duration=0s " + os.DevNull)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -324,7 +320,7 @@ func TestPartialZip(t *testing.T) {
 		})
 
 	// Now do it again and exclude the down node explicitly.
-	out, err = c.RunWithCapture("debug zip " + os.DevNull + " --exclude-nodes=2 --cpu-profile-duration=1s")
+	out, err = c.RunWithCapture("debug zip " + os.DevNull + " --exclude-nodes=2 --cpu-profile-duration=0")
 	if err != nil {
 		t.Fatal(err)
 	}