serverccl: conditionally apply DevOffset in TestServerStartupGuardrails#100701
Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom Apr 5, 2023
Merged
Conversation
When overwriting versions for that test, we were unconditionally applying `clusterversion.DevOffset` to all versions. While that works on master, it makes the test break when it runs on a release branch (where no offsetting happens). In this commit, we check whether binary versions are offset, and only add the DevOffset if they are. Unfortunately, we can't reference versions by key in this test as it references versions from two releases ago. Informs: cockroachdb#100685 Epic: none Release note: None
Member
|
This change is |
Author
|
Failure is flake tracked elsewhere (#92540). TFTR! bors r=knz |
Contributor
|
Timed out. |
Contributor
|
bors r=knz |
Contributor
|
Build succeeded: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When overwriting versions for that test, we were unconditionally applying
clusterversion.DevOffsetto all versions. While that works on master, it makes the test break when it runs on a release branch (where no offsetting happens). In this commit, we check whether binary versions are offset, and only add the DevOffset if they are.Unfortunately, we can't reference versions by key in this test as it references versions from two releases ago.
Informs: #100685
Epic: none
Release note: None