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

DNM: clusterversion: set DevBranch=false #138852

Closed
wants to merge 1 commit into from

Conversation

celiala
Copy link
Collaborator

@celiala celiala commented Jan 10, 2025

This draft against master is solely to iron out CI failures ahead of next week's branch cut.

This should NOT be merged into master (but rather redirected and merged onto release-25.1 as soon as we do next week's branch cut.

Runbook:

  • set DevelopmentBranch = false (and version.txt to beta.1)
  • run dev generate
  • replace hard-coded mentions of 10000MM.d with MM.d (e.g. 1000024.3, 1000025.1)
    • if files in pkg/sql/catalog/systemschema_test were changed, run:
    • ./dev test pkg/sql/catalog/systemschema_test -f=TestValidateSystemSchemaAfterBootStrap --rewrite
    • run ./dev test pkg/sql/catalog/bootstrap --rewrite -f TestInitialValuesToString and follow instructions from test output -- i.e. update system hash= and tenant hash= in sql/catalog/bootstrap/testdata -- until test passes

Release note: None
Epic: None
Release justification: release-process-only change.

Copy link

blathers-crl bot commented Jan 10, 2025

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

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

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@celiala celiala force-pushed the DNM.set-devBranch-false branch 4 times, most recently from 155f2bd to 59b84af Compare January 13, 2025 23:24
@celiala
Copy link
Collaborator Author

celiala commented Jan 13, 2025

pkg/backup/backuprand:backuprand_test:TestBackupRestoreRandomDataRoundtrips fails:

This draft against `master` is solely to iron out CI failures
ahead of next week's branch cut.

This should NOT be merged into `master` (but rather redirected
and merged onto `release-25.1` as soon as we do next week's
branch cut.

Release note: None
Epic: None
Release justification: release-process-only change.
@celiala celiala force-pushed the DNM.set-devBranch-false branch from 59b84af to c876573 Compare January 14, 2025 00:34
@celiala celiala added the do-not-merge bors won't merge a PR with this label. label Jan 14, 2025
@celiala
Copy link
Collaborator Author

celiala commented Jan 15, 2025

blathers backport release-25.1

@celiala
Copy link
Collaborator Author

celiala commented Jan 15, 2025

this has been backported to release-25.1. draft PR against master can now be closed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
do-not-merge bors won't merge a PR with this label.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants