clusterversion: start 25.3 versions

**Checklist**:

- [x] Add version key constant for new release (e.g. `V24_2`), equal to `Latest`.
  Note that we do NOT update the `PreviousRelease` constant. We can only update the
  `PreviousRelease` when an RC is published, which is needed for upgrade
  roachtests.

- [x] Add final version for the previous release (e.g. `V24_1`).

- [x] Add start version (e.g. `V24_2_Start` with version `24.1-2`) and add a new
  first upgrade for it (in `upgrades/upgrades.go`).

- [x] Update `SystemDatabaseSchemaBootstrapVersion` in
  `pkg/sql/catalog/systemschema/system.go` to the start version just created.

- [x] Update `roachpb.successorSeries` map and update `TestReleaseSeriesSuccessor`

- [x] Update `pkg/build/version.txt` to the new version (e.g. `v24.2.0-alpha.00000000`)

- [x] Update the `scplan` rules in `pkg/sql/schemachanger/scplan/internal/rules`:
  - copy the contents of `current` into a new release directory for the previous version
    (e.g. `release_24_1`)
  - change package name in all files (including `BUILD.bazel`), and update the
    version in `current/helpers.go`
  - update `rulesForReleases` in `scplan/plan.go`
  - rewrite the test outputs: `./dev test pkg/sql/schemachanger/scplan/internal/rules/... --rewrite`
  - rewrite `TestDeclarativeRules` output: `./dev test pkg/cli -f DeclarativeRules --rewrite`

- [x] Update releases file:
  ```
  bazel build //pkg/cmd/release:release
  _bazel/bin/pkg/cmd/release/release_/release update-releases-file
  ```
  Note that the forked release version will disappear from the releases file. This
  is what we want; if it is here, we will attempt to run upgrade tests against it.

- [x] Regenerate expected test data as needed (usually
  `pkg/sql/catalog/systemschema_test` and some logictests).

Epic: none
Release note: None

Author: RaduBerinde

docs/generated/settings/settings-for-tenants.txt

@@ -411,4 +411,4 @@ trace.zipkin.collector	string		the address of a Zipkin instance to receive trace
 ui.database_locality_metadata.enabled	boolean	true	if enabled shows extended locality data about databases and tables in DB Console which can be expensive to compute	application
 ui.default_timezone	string		the default timezone used to format timestamps in the ui	application
 ui.display_timezone	enumeration	etc/utc	the timezone used to format timestamps in the ui. This setting is deprecatedand will be removed in a future version. Use the 'ui.default_timezone' setting instead. 'ui.default_timezone' takes precedence over this setting. [etc/utc = 0, america/new_york = 1]	application
-version	version	1000025.1-upgrading-to-1000025.2-step-008	set the active cluster version in the format '<major>.<minor>'	application
+version	version	1000025.2-upgrading-to-1000025.3-step-002	set the active cluster version in the format '<major>.<minor>'	application

docs/generated/settings/settings.html

@@ -369,6 +369,6 @@
 <tr><td><div id="setting-ui-database-locality-metadata-enabled" class="anchored"><code>ui.database_locality_metadata.enabled</code></div></td><td>boolean</td><td><code>true</code></td><td>if enabled shows extended locality data about databases and tables in DB Console which can be expensive to compute</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
 <tr><td><div id="setting-ui-default-timezone" class="anchored"><code>ui.default_timezone</code></div></td><td>string</td><td><code></code></td><td>the default timezone used to format timestamps in the ui</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
 <tr><td><div id="setting-ui-display-timezone" class="anchored"><code>ui.display_timezone</code></div></td><td>enumeration</td><td><code>etc/utc</code></td><td>the timezone used to format timestamps in the ui. This setting is deprecatedand will be removed in a future version. Use the &#39;ui.default_timezone&#39; setting instead. &#39;ui.default_timezone&#39; takes precedence over this setting. [etc/utc = 0, america/new_york = 1]</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
-<tr><td><div id="setting-version" class="anchored"><code>version</code></div></td><td>version</td><td><code>1000025.1-upgrading-to-1000025.2-step-008</code></td><td>set the active cluster version in the format &#39;&lt;major&gt;.&lt;minor&gt;&#39;</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
+<tr><td><div id="setting-version" class="anchored"><code>version</code></div></td><td>version</td><td><code>1000025.2-upgrading-to-1000025.3-step-002</code></td><td>set the active cluster version in the format &#39;&lt;major&gt;.&lt;minor&gt;&#39;</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
 </tbody>
 </table>

pkg/BUILD.bazel

@@ -598,6 +598,7 @@ ALL_TESTS = [
     "//pkg/sql/schemachanger/scplan/internal/rules/current:current_test",
     "//pkg/sql/schemachanger/scplan/internal/rules/release_24_3:release_24_3_test",
     "//pkg/sql/schemachanger/scplan/internal/rules/release_25_1:release_25_1_test",
+    "//pkg/sql/schemachanger/scplan/internal/rules/release_25_2:release_25_2_test",
     "//pkg/sql/schemachanger/scplan/internal/scgraph:scgraph_test",
     "//pkg/sql/schemachanger/scplan:scplan_test",
     "//pkg/sql/schemachanger/screl:screl_test",
@@ -2233,6 +2234,8 @@ GO_TARGETS = [
     "//pkg/sql/schemachanger/scplan/internal/rules/release_24_3:release_24_3_test",
     "//pkg/sql/schemachanger/scplan/internal/rules/release_25_1:release_25_1",
     "//pkg/sql/schemachanger/scplan/internal/rules/release_25_1:release_25_1_test",
+    "//pkg/sql/schemachanger/scplan/internal/rules/release_25_2:release_25_2",
+    "//pkg/sql/schemachanger/scplan/internal/rules/release_25_2:release_25_2_test",
     "//pkg/sql/schemachanger/scplan/internal/rules:rules",
     "//pkg/sql/schemachanger/scplan/internal/scgraph:scgraph",
     "//pkg/sql/schemachanger/scplan/internal/scgraph:scgraph_test",

pkg/build/version.txt

@@ -1 +1 @@
-v25.2.0-alpha.4
+v25.3.0-alpha.00000000

pkg/ccl/kvccl/kvtenantccl/upgradeccl/tenant_upgrade_test.go

@@ -504,11 +504,11 @@ func TestTenantUpgradeFailure(t *testing.T) {
 		db = sqlutils.MakeSQLRunner(conn)
 
 		t.Log("ensure that the tenant still works and the target version wasn't reached")
-		db.CheckQueryResults(t,
-			"SELECT * FROM t", [][]string{{"1"}, {"2"}})
-		db.CheckQueryResults(t,
-			"SELECT split_part(version, '-', 1) FROM [SHOW CLUSTER SETTING version]",
-			[][]string{{v1.String()}})
+		db.CheckQueryResults(t, "SELECT * FROM t", [][]string{{"1"}, {"2"}})
+		res := db.QueryStr(t, "SELECT split_part(version, '-', 1) FROM [SHOW CLUSTER SETTING version]")
+		if res[0][0] == v2.String() {
+			t.Fatalf("current version should not equal target version %s", v2.String())
+		}
 
 		t.Log("restart the tenant")
 		tenant.AppStopper().Stop(ctx)

pkg/ccl/logictestccl/testdata/logic_test/crdb_internal_tenant

@@ -304,7 +304,7 @@ select crdb_internal.get_vmodule()
 query T
 SELECT crdb_internal.release_series(crdb_internal.node_executable_version())
 ----
-25.2
+25.3
 
 query ITTT colnames,rowsort
 select node_id, component, field, regexp_replace(regexp_replace(value, '^\d+$', '<port>'), e':\\d+', ':<port>') as value from crdb_internal.node_runtime_info
@@ -392,7 +392,7 @@ select * from crdb_internal.gossip_alerts
 query T
 SELECT crdb_internal.release_series(crdb_internal.node_executable_version())
 ----
-25.2
+25.3
 
 user root
 

pkg/cli/testdata/declarative-rules/invalid_version

@@ -4,5 +4,6 @@ invalid_version
 debug declarative-print-rules 1.1 op
 unsupported version number, the supported versions are: 
  latest
+ 1000025.2
  1000025.1
  1000024.3

pkg/clusterversion/cockroach_versions.go

@@ -231,6 +231,11 @@ const (
 
 	V25_2_AddUsernameToStmtDiagRequest
 
+	// V25_2 is CockroachDB v25.2. It's used for all v25.2.x patch releases.
+	V25_2
+
+	V25_3_Start
+
 	// *************************************************
 	// Step (1) Add new versions above this comment.
 	// Do not add new versions to a patch release.
@@ -287,6 +292,10 @@ var versionTable = [numKeys]roachpb.Version{
 	V25_2_SetUiDefaultTimezoneSetting:  {Major: 25, Minor: 1, Internal: 6},
 	V25_2_AddUsernameToStmtDiagRequest: {Major: 25, Minor: 1, Internal: 8},
 
+	V25_2: {Major: 25, Minor: 2, Internal: 0},
+
+	V25_3_Start: {Major: 25, Minor: 2, Internal: 2},
+
 	// *************************************************
 	// Step (2): Add new versions above this comment.
 	// Do not add new versions to a patch release.
@@ -304,13 +313,13 @@ const MinSupported Key = V24_3
 // have at least an RC build published).
 const PreviousRelease Key = V25_1
 
-// V25_2 is a placeholder that will eventually be replaced by the actual 25.2
+// V25_3 is a placeholder that will eventually be replaced by the actual 25.3
 // version Key, but in the meantime it points to the latest Key. The placeholder
 // is defined so that it can be referenced in code that simply wants to check if
-// a cluster is running 24.3 and has completed all associated migrations; most
+// a cluster is running 25.3 and has completed all associated migrations; most
 // version gates can use this instead of defining their own version key if they
-// only need to check that the cluster has upgraded to 25.2.
-const V25_2 = Latest
+// only need to check that the cluster has upgraded to 25.3.
+const V25_3 = Latest
 
 // DevelopmentBranch must be true on the main development branch but should be
 // set to false on a release branch once the set of versions becomes append-only

pkg/roachpb/version.go

@@ -237,6 +237,7 @@ var successorSeries = map[ReleaseSeries]ReleaseSeries{
 	{24, 2}: {24, 3},
 	{24, 3}: {25, 1},
 	{25, 1}: {25, 2},
+	{25, 2}: {25, 3},
 }
 
 // ReleaseSeries obtains the release series for the given version. Specifically:

pkg/roachpb/version_test.go

@@ -93,7 +93,7 @@ func TestReleaseSeriesSuccessor(t *testing.T) {
 	for ok := true; ok; r, ok = r.Successor() {
 		seq = append(seq, r.String())
 	}
-	expected := "20.1, 20.2, 21.1, 21.2, 22.1, 22.2, 23.1, 23.2, 24.1, 24.2, 24.3, 25.1, 25.2"
+	expected := "20.1, 20.2, 21.1, 21.2, 22.1, 22.2, 23.1, 23.2, 24.1, 24.2, 24.3, 25.1, 25.2, 25.3"
 	require.Equal(t, expected, strings.Join(seq, ", "))
 }