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

Prepare the release-2.7 branch #284

Merged
merged 2 commits into from
Jul 13, 2022
Merged

Prepare the release-2.7 branch #284

merged 2 commits into from
Jul 13, 2022

Conversation

frouioui
Copy link
Member

@frouioui frouioui commented Jul 12, 2022

Description

This Pull Request updates the release-2.7 branch to prepare it for the future releases of 2.7.*. It is part of the changes required to adopt a new release workflow that includes release branches.

It changes the version.go file and reverts the recent changes to vtorc tests (#282, #283) and the upgrade of dependencies (#280). The Pull Request #281 is also reverted.

@GuptaManan100, I have reverted the above Pull Request to restore the branch to its state when releasing v2.7.1. I have left the most recent changes to VTAdmin: #278 and #279. Let me know if this is an issue.

Changes that are reverted

Changes that are kept

@frouioui frouioui changed the base branch from main to release-2.7 July 12, 2022 14:54
@frouioui frouioui requested a review from GuptaManan100 July 12, 2022 15:19
@frouioui frouioui marked this pull request as ready for review July 12, 2022 15:19
@frouioui frouioui requested review from deepthi and Verolop July 12, 2022 15:20
Copy link
Contributor

@Verolop Verolop left a comment

Choose a reason for hiding this comment

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

lgtm with the changes to restore the branch to the previous state, so I'll approve it, but would also be great to have @GuptaManan100 's +1 for the VTAdmin PRs

@GuptaManan100
Copy link
Collaborator

GuptaManan100 commented Jul 13, 2022

@frouioui Shouldn't we start the branch with the tagged version 2.7 and just change the version information there. Then we know that the branch would be at exactly the state that we did the release on. We should then backport the relevant PRs. Just my thoughts on the matter, this is fine too. I'll add the vtorc test again though on that branch, just to be sure that works.
The test will require to be altered a little bit though, since VTOp doesn't do SetKeyspaceDurabilityPolicy in that version

@frouioui
Copy link
Member Author

@GuptaManan100, I agree, this is a similar logic here. The two PRs #278 & #279 are already "backported"/included.

Copy link
Collaborator

@GuptaManan100 GuptaManan100 left a comment

Choose a reason for hiding this comment

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

Okay! Great

@frouioui frouioui merged commit 14d844c into release-2.7 Jul 13, 2022
@frouioui frouioui deleted the update-release-2.7 branch July 13, 2022 10:59
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.

3 participants