Merge #153218 #153221 #153290

153218: roachtest/mixedversion: ensure WaitForSQLReady for every node r=darrylwong a=srosenberg

A typo in [1] resulted in `WaitForSQLReady` being
checked for only one node, instead of every.

[1] #138109

Epic: none
Release note: None

153221: roachtest: fix `sumCounterIncreases` r=jbowens a=srosenberg

Fix a typo in `sumCounterIncreases`
which was previously overshooting, i.e.,
double counting.

Epic: none
Release note: None

153290: telemetryccl: skip TestTelemetry r=dhartunian a=dhartunian

Part of: #152123
Epic: None
Release note: None

Co-authored-by: Stan Rosenberg <[email protected]>
Co-authored-by: David Hartunian <[email protected]>

Author: 3 people

pkg/ccl/telemetryccl/telemetry_test.go

@@ -22,6 +22,8 @@ func TestTelemetry(t *testing.T) {
 	skip.UnderRace(t, "takes >1min under race")
 	skip.UnderDeadlock(t, "takes >1min under deadlock")
 
+	skip.WithIssue(t, 152123)
+
 	sqltestutils.TelemetryTest(
 		t,
 		[]base.TestServerArgs{

pkg/cmd/roachtest/cluster.go

@@ -2199,7 +2199,7 @@ func (c *clusterImpl) StartE(
 	if !startOpts.RoachprodOpts.SkipInit && !startOpts.RoachprodOpts.SkipWaitForSQL {
 		// Wait for SQL to be ready on all nodes, for 'system' tenant, only.
 		for _, n := range nodes {
-			conn, err := c.ConnE(ctx, l, nodes[0], option.VirtualClusterName(install.SystemInterfaceName))
+			conn, err := c.ConnE(ctx, l, n, option.VirtualClusterName(install.SystemInterfaceName))
 			if err != nil {
 				return errors.Wrapf(err, "failed to connect to n%d", n)
 			}

pkg/cmd/roachtest/tests/ts_util.go

@@ -91,7 +91,7 @@ func sumCounterIncreases(dataPoints []tspb.TimeSeriesDatapoint) (sum float64) {
 			sum += dataPoints[i].Value
 			continue
 		}
-		sum += dataPoints[i].Value - dataPoints[0].Value
+		sum += dataPoints[i].Value - dataPoints[i-1].Value
 	}
 	return sum
 }