Skip to content

Commit c75177a

Browse files
committed
release-25.4: clusterversion: set devBranch to false
Part of: REL-3228 Release note: None Epic: None
1 parent 118aaf8 commit c75177a

File tree

13 files changed

+122
-22
lines changed

13 files changed

+122
-22
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,4 +421,4 @@ trace.zipkin.collector string the address of a Zipkin instance to receive trace
421421
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
422422
ui.default_timezone string the default timezone used to format timestamps in the ui application
423423
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
424-
version version 1000025.3-upgrading-to-1000025.4-step-014 set the active cluster version in the format '<major>.<minor>' application
424+
version version 25.3-upgrading-to-25.4-step-014 set the active cluster version in the format '<major>.<minor>' application

docs/generated/settings/settings.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,6 @@
379379
<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>Basic/Standard/Advanced/Self-Hosted</td></tr>
380380
<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>Basic/Standard/Advanced/Self-Hosted</td></tr>
381381
<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>Basic/Standard/Advanced/Self-Hosted</td></tr>
382-
<tr><td><div id="setting-version" class="anchored"><code>version</code></div></td><td>version</td><td><code>1000025.3-upgrading-to-1000025.4-step-014</code></td><td>set the active cluster version in the format &#39;&lt;major&gt;.&lt;minor&gt;&#39;</td><td>Basic/Standard/Advanced/Self-Hosted</td></tr>
382+
<tr><td><div id="setting-version" class="anchored"><code>version</code></div></td><td>version</td><td><code>25.3-upgrading-to-25.4-step-014</code></td><td>set the active cluster version in the format &#39;&lt;major&gt;.&lt;minor&gt;&#39;</td><td>Basic/Standard/Advanced/Self-Hosted</td></tr>
383383
</tbody>
384384
</table>

pkg/build/version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v25.4.0-alpha.2
1+
v25.4.0-beta.1

pkg/cli/declarative_print_rules.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ a given corpus file.
3737
Version: version,
3838
})
3939
if rules == nil {
40-
fmt.Printf("unsupported version number, the supported versions are: \n")
40+
fmt.Printf("unsupported version number, the supported versions are:\n")
4141
for _, v := range scplan.GetReleasesForRulesRegistries() {
4242
fmt.Printf(" %s\n", v)
4343
}

pkg/cli/testdata/declarative-rules/deprules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dep
22
----
3-
debug declarative-print-rules 1000025.3 dep
3+
debug declarative-print-rules 25.3 dep
44
deprules
55
----
66
- name: 'CheckConstraint transitions to ABSENT uphold 2-version invariant: PUBLIC->VALIDATED'

pkg/cli/testdata/declarative-rules/invalid_version

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ invalid_version
22
-----
33
----
44
debug declarative-print-rules 1.1 op
5-
unsupported version number, the supported versions are:
5+
unsupported version number, the supported versions are:
66
latest
7-
1000025.2
8-
1000025.3
7+
25.2
8+
25.3

pkg/clusterversion/CLAUDE.md

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
# CockroachDB Release Preparation Guide
2+
3+
This document provides step-by-step instructions for preparing the CockroachDB source tree for beta releases, specifically following the R.1: Prepare for beta checklist from the clusterversion README.md.
4+
5+
## Beta Release Preparation (R.1 Checklist)
6+
7+
When preparing for a beta release (e.g., 25.4 beta1), the following files must be updated:
8+
9+
### 1. Core Version Changes
10+
11+
**Set Development Branch Flag:**
12+
- File: `pkg/clusterversion/cockroach_versions.go`
13+
- Change: Set `const DevelopmentBranch = false` (line ~334)
14+
15+
**Update Version String:**
16+
- File: `pkg/build/version.txt`
17+
- Change: Update from alpha to beta version (e.g., `v25.4.0-alpha.2``v25.4.0-beta.1`)
18+
19+
### 2. Regenerate Documentation
20+
21+
Run the following command to update generated documentation:
22+
```bash
23+
./dev gen docs
24+
```
25+
26+
This updates:
27+
- `docs/generated/settings/settings-for-tenants.txt`
28+
- `docs/generated/settings/settings.html`
29+
30+
### 3. Update Test Data
31+
32+
**System Schema Tests:**
33+
Run this command to regenerate bootstrap test data:
34+
```bash
35+
./dev test pkg/sql/catalog/systemschema_test --rewrite
36+
```
37+
38+
This updates:
39+
- `pkg/sql/catalog/systemschema_test/testdata/bootstrap_system`
40+
- `pkg/sql/catalog/systemschema_test/testdata/bootstrap_tenant`
41+
42+
**Bootstrap Hash Test:**
43+
Run this command and manually update hash values if the test fails:
44+
```bash
45+
./dev test pkg/sql/catalog/bootstrap --rewrite -f TestInitialValuesToString
46+
```
47+
48+
If the rewrite fails, manually update the hash values in:
49+
- `pkg/sql/catalog/bootstrap/testdata/testdata`
50+
- Update `system hash=` value
51+
- Update `tenant hash=` value
52+
- Update binary data values as shown in test output
53+
54+
### 4. CLI Test Data Updates
55+
56+
**Declarative Rules Tests:**
57+
- File: `pkg/cli/testdata/declarative-rules/deprules`
58+
- Change: Update version reference to current release branch (e.g., `debug declarative-print-rules 25.2 dep``debug declarative-print-rules 25.3 dep`)
59+
60+
- File: `pkg/cli/testdata/declarative-rules/invalid_version`
61+
- Change: Update supported versions list to reflect current releases (use short format like `25.2`, `25.3` not `1000025.x`)
62+
63+
### 5. Logic Test Updates
64+
65+
**Internal Catalog Test:**
66+
- File: `pkg/sql/logictest/testdata/logic_test/crdb_internal_catalog`
67+
- Change: Update `majorVal` from `1000025` to `25` in systemDatabaseSchemaVersion entries
68+
69+
## Example PR Reference
70+
71+
For reference, see PR #148382 which demonstrates the complete set of changes needed for beta release preparation.
72+
73+
## Expected File Count
74+
75+
A typical beta release preparation should modify approximately 10-12 files:
76+
1. `pkg/clusterversion/cockroach_versions.go`
77+
2. `pkg/build/version.txt`
78+
3. `docs/generated/settings/settings-for-tenants.txt`
79+
4. `docs/generated/settings/settings.html`
80+
5. `pkg/sql/catalog/systemschema_test/testdata/bootstrap_system`
81+
6. `pkg/sql/catalog/systemschema_test/testdata/bootstrap_tenant`
82+
7. `pkg/sql/catalog/bootstrap/testdata/testdata`
83+
8. `pkg/cli/testdata/declarative-rules/deprules`
84+
9. `pkg/cli/testdata/declarative-rules/invalid_version`
85+
10. `pkg/sql/logictest/testdata/logic_test/crdb_internal_catalog`
86+
87+
## Verification
88+
89+
After making all changes:
90+
1. Run the bootstrap test to ensure it passes: `./dev test pkg/sql/catalog/bootstrap -f TestInitialValuesToString`
91+
2. Check git status to verify expected number of modified files
92+
3. All tests should pass before proceeding with the release
93+
94+
## Notes
95+
96+
- Some test data files contain binary encoded data that may change when version numbers are updated
97+
- Hash values in bootstrap test data are expected to change when the development branch flag is modified
98+
- The logic test updates are necessary to reflect the new major version in system database schema version metadata
99+
- CLI declarative rules tests use short version format (e.g., `25.3`) not the long format (e.g., `1000025.3`)
100+
- Always run the CLI tests after updating declarative rules files to ensure correct version format

pkg/clusterversion/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ code for more details.
103103
- [ ] Regenerate docs (`./dev gen docs`)
104104
- [ ] Regenerate expected test data results as needed
105105

106-
**Example PR:** [#113912](https://github.com/cockroachdb/cockroach/pull/113912)
106+
**Example PR:** [#153906](https://github.com/cockroachdb/cockroach/pull/153906)
107107

108108
### R.2: Mint release
109109

pkg/clusterversion/cockroach_versions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ const V25_4 = Latest
331331
// binary in a dev cluster.
332332
//
333333
// See devOffsetKeyStart for more details.
334-
const DevelopmentBranch = true
334+
const DevelopmentBranch = false
335335

336336
// finalVersion should be set on a release branch to the minted final cluster
337337
// version key, e.g. to V23_2 on the release-23.2 branch once it is minted.

pkg/sql/catalog/bootstrap/testdata/testdata

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
system hash=df1fa2f53ba08da737d4f20447621a7d78fc47cbe67491d2c44da9354e09e390
1+
system hash=aa99c7e232901ef84023288f1b58f00696fe795babf6a4b5cbc4a60fcde8e394
22
----
33
[{"key":"8b"}
4-
,{"key":"8b89898a89","value":"0312470a0673797374656d10011a250a0d0a0561646d696e1080101880100a0c0a04726f6f7410801018801012046e6f646518032200280140004a006a0a08d9843d10031800200e7000"}
4+
,{"key":"8b89898a89","value":"0312450a0673797374656d10011a250a0d0a0561646d696e1080101880100a0c0a04726f6f7410801018801012046e6f646518032200280140004a006a08081910031800200e7000"}
55
,{"key":"8b898b8a89","value":"030aaa030a0a64657363726970746f721803200128013a0042290a02696410011a0e0801104018002a003003501460002000300068007000780080010088010098010042310a0a64657363726970746f7210021a0e0808100018002a0030005011600020013000680070007800800100880100980100480352770a077072696d61727910011801220269642a0a64657363726970746f72300140004a10080010001a00200028003000380040005a0070027a0408002000800100880100900104980101a20106080012001800a80100b20100ba0100c00100c80100d00101e00100e9010000000000000000f20100f8010060026a210a0b0a0561646d696e102018200a0a0a04726f6f741020182012046e6f64651803800101880103980100b201130a077072696d61727910001a02696420012800b201240a1066616d5f325f64657363726970746f7210021a0a64657363726970746f7220022802b80103c20100e80100f2010408001200f801008002009202009a0200b20200b80200c0021dc80200e00200800300880302a80300b00300d00300d80300e00300f80300880400980400a00400a80400b00400"}
66
,{"key":"8b898c8a89","value":"030a92070a0575736572731804200128013a00422f0a08757365726e616d6510011a0e0807100018002a003000501960002000300068007000780080010088010098010042350a0e68617368656450617373776f726410021a0e0808100018002a003000501160002001300068007000780080010088010098010042340a066973526f6c6510031a0e0800100018002a0030005010600020002a0566616c73653000680070007800800100880100980100422e0a07757365725f696410041a0e080c100018002a003000501a60002000300068007000780080010088010098010042410a19657374696d617465645f6c6173745f6c6f67696e5f74696d6510051a0f0809100018002a00300050a009600020013000680070007800800100880100980100480652b3010a077072696d617279100118012208757365726e616d652a0e68617368656450617373776f72642a066973526f6c652a07757365725f69642a19657374696d617465645f6c6173745f6c6f67696e5f74696d65300140004a10080010001a00200028003000380040005a0070027003700470057a0408002000800100880100900104980101a20106080012001800a80100b20100ba0100c00100c80100d00102e00100e9010000000000000000f20100f801005a7a0a1175736572735f757365725f69645f696478100218012207757365725f69643004380140004a10080010001a00200028003000380040005a007a0408002000800100880100900103980100a20106080012001800a80100b20100ba0100c00100c80100d00101e00100e9010000000000000000f20100f8010060036a250a0d0a0561646d696e10e00318e0030a0c0a04726f6f7410e00318e00312046e6f64651803800101880103980100b201240a077072696d61727910001a08757365726e616d651a07757365725f6964200120042804b2012c0a1466616d5f325f68617368656450617373776f726410021a0e68617368656450617373776f726420022802b2011c0a0c66616d5f335f6973526f6c6510031a066973526f6c6520032803b201420a1f66616d5f355f657374696d617465645f6c6173745f6c6f67696e5f74696d6510051a19657374696d617465645f6c6173745f6c6f67696e5f74696d6520052805b80106c20100e80100f2010408001200f801008002009202009a0200b20200b80200c0021dc80200e00200800300880303a80300b00300d00300d80300e00300f80300880400980400a00400a80400b00400"}
77
,{"key":"8b898d8a89","value":"030a99030a057a6f6e65731805200128013a0042290a02696410011a0e0801104018002a0030035014600020003000680070007800800100880100980100422d0a06636f6e66696710021a0e0808100018002a0030005011600020013000680070007800800100880100980100480352730a077072696d61727910011801220269642a06636f6e666967300140004a10080010001a00200028003000380040005a0070027a0408002000800100880100900104980101a20106080012001800a80100b20100ba0100c00100c80100d00101e00100e9010000000000000000f20100f8010060026a250a0d0a0561646d696e10e00318e0030a0c0a04726f6f7410e00318e00312046e6f64651803800101880103980100b201130a077072696d61727910001a02696420012800b2011c0a0c66616d5f325f636f6e66696710021a06636f6e66696720022802b80103c20100e80100f2010408001200f801008002009202009a0200b20200b80200c0021dc80200e00200800300880302a80300b00300d00300d80300e00300f80300880400980400a00400a80400b00400"}
@@ -225,10 +225,10 @@ system hash=df1fa2f53ba08da737d4f20447621a7d78fc47cbe67491d2c44da9354e09e390
225225
,{"key":"d4"}
226226
]
227227

228-
tenant hash=1dada692b15eab2717ad8966099e3a2b0d80c0c66c81f2f77c8f074604c55490
228+
tenant hash=d204549ce6078db5c1fcc886f17436791afc593dd600cdb0621d23e10e0bc20f
229229
----
230230
[{"key":""}
231-
,{"key":"8b89898a89","value":"0312470a0673797374656d10011a250a0d0a0561646d696e1080101880100a0c0a04726f6f7410801018801012046e6f646518032200280140004a006a0a08d9843d10031800200e7000"}
231+
,{"key":"8b89898a89","value":"0312450a0673797374656d10011a250a0d0a0561646d696e1080101880100a0c0a04726f6f7410801018801012046e6f646518032200280140004a006a08081910031800200e7000"}
232232
,{"key":"8b898b8a89","value":"030aaa030a0a64657363726970746f721803200128013a0042290a02696410011a0e0801104018002a003003501460002000300068007000780080010088010098010042310a0a64657363726970746f7210021a0e0808100018002a0030005011600020013000680070007800800100880100980100480352770a077072696d61727910011801220269642a0a64657363726970746f72300140004a10080010001a00200028003000380040005a0070027a0408002000800100880100900104980101a20106080012001800a80100b20100ba0100c00100c80100d00101e00100e9010000000000000000f20100f8010060026a210a0b0a0561646d696e102018200a0a0a04726f6f741020182012046e6f64651803800101880103980100b201130a077072696d61727910001a02696420012800b201240a1066616d5f325f64657363726970746f7210021a0a64657363726970746f7220022802b80103c20100e80100f2010408001200f801008002009202009a0200b20200b80200c0021dc80200e00200800300880302a80300b00300d00300d80300e00300f80300880400980400a00400a80400b00400"}
233233
,{"key":"8b898c8a89","value":"030a92070a0575736572731804200128013a00422f0a08757365726e616d6510011a0e0807100018002a003000501960002000300068007000780080010088010098010042350a0e68617368656450617373776f726410021a0e0808100018002a003000501160002001300068007000780080010088010098010042340a066973526f6c6510031a0e0800100018002a0030005010600020002a0566616c73653000680070007800800100880100980100422e0a07757365725f696410041a0e080c100018002a003000501a60002000300068007000780080010088010098010042410a19657374696d617465645f6c6173745f6c6f67696e5f74696d6510051a0f0809100018002a00300050a009600020013000680070007800800100880100980100480652b3010a077072696d617279100118012208757365726e616d652a0e68617368656450617373776f72642a066973526f6c652a07757365725f69642a19657374696d617465645f6c6173745f6c6f67696e5f74696d65300140004a10080010001a00200028003000380040005a0070027003700470057a0408002000800100880100900104980101a20106080012001800a80100b20100ba0100c00100c80100d00102e00100e9010000000000000000f20100f801005a7a0a1175736572735f757365725f69645f696478100218012207757365725f69643004380140004a10080010001a00200028003000380040005a007a0408002000800100880100900103980100a20106080012001800a80100b20100ba0100c00100c80100d00101e00100e9010000000000000000f20100f8010060036a250a0d0a0561646d696e10e00318e0030a0c0a04726f6f7410e00318e00312046e6f64651803800101880103980100b201240a077072696d61727910001a08757365726e616d651a07757365725f6964200120042804b2012c0a1466616d5f325f68617368656450617373776f726410021a0e68617368656450617373776f726420022802b2011c0a0c66616d5f335f6973526f6c6510031a066973526f6c6520032803b201420a1f66616d5f355f657374696d617465645f6c6173745f6c6f67696e5f74696d6510051a19657374696d617465645f6c6173745f6c6f67696e5f74696d6520052805b80106c20100e80100f2010408001200f801008002009202009a0200b20200b80200c0021dc80200e00200800300880303a80300b00300d00300d80300e00300f80300880400980400a00400a80400b00400"}
234234
,{"key":"8b898d8a89","value":"030a99030a057a6f6e65731805200128013a0042290a02696410011a0e0801104018002a0030035014600020003000680070007800800100880100980100422d0a06636f6e66696710021a0e0808100018002a0030005011600020013000680070007800800100880100980100480352730a077072696d61727910011801220269642a06636f6e666967300140004a10080010001a00200028003000380040005a0070027a0408002000800100880100900104980101a20106080012001800a80100b20100ba0100c00100c80100d00101e00100e9010000000000000000f20100f8010060026a250a0d0a0561646d696e10e00318e0030a0c0a04726f6f7410e00318e00312046e6f64651803800101880103980100b201130a077072696d61727910001a02696420012800b2011c0a0c66616d5f325f636f6e66696710021a06636f6e66696720022802b80103c20100e80100f2010408001200f801008002009202009a0200b20200b80200c0021dc80200e00200800300880302a80300b00300d00300d80300e00300f80300880400980400a00400a80400b00400"}

0 commit comments

Comments
 (0)