Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

clusterversion: create 25.1 version #134750

Merged
merged 2 commits into from
Nov 15, 2024

Conversation

RaduBerinde
Copy link
Member

@RaduBerinde RaduBerinde commented Nov 9, 2024

clusterversion: create 25.1 version

This change bumps the version on master to 25.1 without advancing the
previous release to 24.3 (the latter can only be done once we have a
published RC, or upgrade tests will fail). To allow this decoupling, a
few minor tweaks were needed (to SupportedPreviousReleases and to
the tool that generates the releases file.

Also made some minor improvements to the runbook and
sql-bootstrap-data. I will do a more thorough change to the runbook
that separates this step.

  • Add version key constant for new release, equal to Latest
  • Add start version
  • Update pkg/build/version.txt to the new version
  • Update the scplan rules in pkg/sql/schemachanger/scplan/internal/rules (already done)
  • Update releases file

Epic: REL-1322

Copy link

blathers-crl bot commented Nov 9, 2024

Your pull request contains more than 1000 changes. It is strongly encouraged to split big PRs into smaller chunks.

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@RaduBerinde RaduBerinde force-pushed the bump-version-25.1 branch 7 times, most recently from 9da6128 to fba196c Compare November 15, 2024 00:54
@RaduBerinde RaduBerinde marked this pull request as ready for review November 15, 2024 01:09
@RaduBerinde RaduBerinde requested review from a team as code owners November 15, 2024 01:09
@RaduBerinde RaduBerinde requested review from herkolategan, srosenberg, jbowens, michae2, dt, celiala and a team and removed request for a team November 15, 2024 01:09
@RaduBerinde RaduBerinde force-pushed the bump-version-25.1 branch 2 times, most recently from 6ff0eb7 to 3b6d8e5 Compare November 15, 2024 03:22
@RaduBerinde RaduBerinde force-pushed the bump-version-25.1 branch 2 times, most recently from b05eb4f to 7cd36fa Compare November 15, 2024 03:29
This change bumps the version on master to 25.1 without advancing the
previous release to 24.3 (the latter can only be done once we have a
published RC, or upgrade tests will fail). To allow this decoupling, a
few minor tweaks were needed (to `SupportedPreviousReleases` and to
the tool that generates the releases file.

Also made some minor improvements to the runbook and
sql-bootstrap-data. I will do a more thorough change to the runbook
that separates this step.

- [x] Add version key constant for new release, equal to `Latest`
- [x] Add start version
- [x] Update `pkg/build/version.txt` to the new version
- [x] Update the `scplan` rules in `pkg/sql/schemachanger/scplan/internal/rules` (already done)
- [x] Update releases file

Epic: REL-1322
pkg/cmd/release/update_releases.go Outdated Show resolved Hide resolved
@RaduBerinde
Copy link
Member Author

CC @spilchen for the second commit.

Copy link
Collaborator

@celiala celiala left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had one question around keeping 24.3 (instead of replacing) for pkg/testutils/release/cockroach_releases.yaml.

everything else made sense to me.

@@ -183,7 +183,10 @@ avoid large changes on `master` which might cause merge conflicts for backports.

- [ ] Update `PreviousRelease` constant

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you for keeping the runbook up-to-date!

// For the purposes of the cockroach_releases file, we are only interested
// in rc pre-releases, as we do not support upgrades from alpha or beta
// releases.
if pre := v.PreRelease(); pre != "" && !strings.HasPrefix(pre, "rc") {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice fix/solution 👍🏼

@@ -39,10 +39,6 @@ func Test_processReleaseData(t *testing.T) {
Predecessor: "22.2",
Withdrawn: []string{"23.1.0"},
},
"23.2": {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to confirm, this removal/cleanup is more related to advancing MinSupported to 24.3 (than to creating 24.3 and 25.1 start version gates, right?)

(mostly to clarify for when we refer to this for the next release cycle/task)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just a test for the updated releases code, which we updated to ignore beta builds. This test runs against fixed data, the versions should be considered fictitious.

@@ -244,7 +245,7 @@ func Test_choosePreviousReleases(t *testing.T) {
arch: vm.ArchAMD64,
numUpgrades: 3,
enableSkipVersion: true,
expectedReleases: []string{"23.2.4", "24.1.1", "24.2.2"},
expectedReleases: []string{"23.1.17", "23.2.4", "24.1.1"},
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

x-referencing note from MinSupport bump comment (for when we do this task for the next cycle), that this change is a result of the randomized sequence of versions that the test decides on with that seed.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, and it's all based on the testPredecessorMapping (not the actual release data)

@@ -29,6 +29,5 @@
withdrawn:
- 24.2.1
predecessor: "24.1"
"24.3":
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should keep 24.3, yes?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, if we have 24.3 here, we will attempt to test upgrades from it. It will show up once RC is published and we generate the roachtest fixtures. I'll make sure to clarify this when I update the runbook.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, thanks for clarifying 👍🏼

Copy link
Collaborator

@celiala celiala left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - thank you!

@@ -29,6 +29,5 @@
withdrawn:
- 24.2.1
predecessor: "24.1"
"24.3":
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, thanks for clarifying 👍🏼

@RaduBerinde
Copy link
Member Author

TFTRs!

bors r+

@craig craig bot merged commit 3ac6224 into cockroachdb:master Nov 15, 2024
23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants