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

roachprod: add COCKROACH_UPGRADE_TO_DEV_VERSION to DefaultEnvVars #88005

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pkg/cmd/roachtest/tests/versionupgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,6 @@ func upgradeNodes(

binary := uploadVersion(ctx, t, c, c.Node(node), newVersion)
settings := install.MakeClusterSettings(install.BinaryOption(binary))
settings.Env = append(settings.Env, "COCKROACH_UPGRADE_TO_DEV_VERSION=true")
c.Start(ctx, t.L(), startOpts, settings, c.Node(node))

// We have seen cases where a transient error could occur when this
Expand Down
5 changes: 5 additions & 0 deletions pkg/roachprod/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,11 @@ func DefaultEnvVars() []string {
"COCKROACH_ENABLE_RPC_COMPRESSION=false",
// Get rid of an annoying popup in the UI.
"COCKROACH_UI_RELEASE_NOTES_SIGNUP_DISMISSED=true",
// Allow upgrading a stable release data-dir to a dev version.
// N.B. many roachtests which perform upgrade scenarios require this env. var after changes in [1]; otherwise,
// the tests will fail even on release branches when attempting to upgrade previous (stable) release to an alpha.
// [1] https://github.com/cockroachdb/cockroach/pull/87468
"COCKROACH_UPGRADE_TO_DEV_VERSION=true",
}
}

Expand Down