Merge #156535 #157032 #157039

156535: clusterversion: enable 25.4 upgrade tests (M.3) r=rail,RaduBerinde,rafiss a=celiala

This PR contains 2 commits:

1. Commit 1 fixes a bug, where we were bootstraping the incorrect data for the 25.3 tenant (i.e. the fix proposed from comment: #156535 (comment))
2. Commit 2 implements M.3 "Enable upgrade tests" from the [pkg/clusterversion/ runbook](https://github.com/cockroachdb/cockroach/blob/master/pkg/clusterversion/README.md), enabling roachtest upgrade tests with version 25.4 after the first RC (v25.4.0-rc.1) was published.

Release note: None
Epic: None

🤖 Generated with [Claude Code](https://claude.com/claude-code)

157032: mmaprototype: comment on the lifecycle of pending changes r=wenyihu6 a=wenyihu6

Epic: CRDB-55052
Release note: None

157039: logictest: fix MR parallelization flake for good r=yuzefovich a=yuzefovich

We saw a logic test fail because of `parallel-scan-result-threshold` value being metamorphic - force production values for this test file.

Fixes: #156973.
Release note: None

Co-authored-by: Celia La <[email protected]>
Co-authored-by: wenyihu6 <[email protected]>
Co-authored-by: Yahor Yuzefovich <[email protected]>

Author: 4 people

pkg/BUILD.bazel

@@ -520,6 +520,7 @@ ALL_TESTS = [
     "//pkg/sql/logictest/tests/5node:5node_test",
     "//pkg/sql/logictest/tests/cockroach-go-testserver-25.2:cockroach-go-testserver-25_2_test",
     "//pkg/sql/logictest/tests/cockroach-go-testserver-25.3:cockroach-go-testserver-25_3_test",
+    "//pkg/sql/logictest/tests/cockroach-go-testserver-25.4:cockroach-go-testserver-25_4_test",
     "//pkg/sql/logictest/tests/fakedist-disk:fakedist-disk_test",
     "//pkg/sql/logictest/tests/fakedist-vec-off:fakedist-vec-off_test",
     "//pkg/sql/logictest/tests/fakedist:fakedist_test",
@@ -2095,6 +2096,7 @@ GO_TARGETS = [
     "//pkg/sql/logictest/tests/5node:5node_test",
     "//pkg/sql/logictest/tests/cockroach-go-testserver-25.2:cockroach-go-testserver-25_2_test",
     "//pkg/sql/logictest/tests/cockroach-go-testserver-25.3:cockroach-go-testserver-25_3_test",
+    "//pkg/sql/logictest/tests/cockroach-go-testserver-25.4:cockroach-go-testserver-25_4_test",
     "//pkg/sql/logictest/tests/fakedist-disk:fakedist-disk_test",
     "//pkg/sql/logictest/tests/fakedist-vec-off:fakedist-vec-off_test",
     "//pkg/sql/logictest/tests/fakedist:fakedist_test",

pkg/ccl/logictestccl/testdata/logic_test/regional_by_row_cascade

@@ -1,4 +1,4 @@
-# LogicTest: multiregion-9node-3region-3azs
+# LogicTest: multiregion-9node-3region-3azs !metamorphic-batch-sizes
 
 # Set the closed timestamp interval to be short to shorten the amount of time
 # we need to wait for the system config to propagate.
@@ -64,7 +64,7 @@ SELECT crdb_internal.clear_table_stats_cache();
 
 # Only the scan in the main query is parallelized when we don't have stats on
 # the descendant tables.
-query I retry
+query I
 SELECT count(*) FROM [EXPLAIN (VERBOSE) DELETE FROM great_grandparent WHERE i = 1] WHERE info LIKE '%parallel%';
 ----
 1