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

Use release branches instead of git tags for upgrade/downgrade #16414

Closed

Conversation

frouioui
Copy link
Member

Description

This PR changes what git ref we use during the upgrade/downgrade tests. Instead of using the next/previous git tags, we will use release branches. This will ensure that a change made on main is compatible with the next release we will make out of release-20.0. Prior to that, we were just checking that a branch was compatible with the next/previous release, which does not cover new code that was merged on the release branch.

Let's backport this to all supported release branches as we want all branches to follow this new methodology.

Tests

# upgrade on main, no upgrade = empty line output
$ ./tools/get_next_release.sh main refs/pull/00000/merge 


# upgrade on release-20.0
$ ./tools/get_next_release.sh release-20.0 refs/pull/00000/merge
main

# upgrade on release-19.0
$ ./tools/get_next_release.sh release-19.0 refs/pull/00000/merge
release-20.0

# upgrade on release-18.0
$ ./tools/get_next_release.sh release-18.0 refs/pull/00000/merge
release-19.0

# downgrade on main
./tools/get_previous_release.sh  refs/heads/main
release-20.0

# downgrade on release-20.0
$ ./tools/get_previous_release.sh release-20.0 refs/pull/00000/merge
release-19.0

# downgrade on release-19.0
$ ./tools/get_previous_release.sh release-19.0 refs/pull/00000/merge
release-18.0

# downgrade on release-18.0
$ ./tools/get_previous_release.sh release-18.0 refs/pull/00000/merge
release-17.0

Related Issue(s)

Signed-off-by: Florent Poinsard <[email protected]>
Signed-off-by: Florent Poinsard <[email protected]>
Signed-off-by: Florent Poinsard <[email protected]>
Copy link
Contributor

vitess-bot bot commented Jul 16, 2024

Review Checklist

Hello reviewers! 👋 Please follow this checklist when reviewing this Pull Request.

General

  • Ensure that the Pull Request has a descriptive title.
  • Ensure there is a link to an issue (except for internal cleanup and flaky test fixes), new features should have an RFC that documents use cases and test cases.

Tests

  • Bug fixes should have at least one unit or end-to-end test, enhancement and new features should have a sufficient number of tests.

Documentation

  • Apply the release notes (needs details) label if users need to know about this change.
  • New features should be documented.
  • There should be some code comments as to why things are implemented the way they are.
  • There should be a comment at the top of each new or modified test to explain what the test does.

New flags

  • Is this flag really necessary?
  • Flag names must be clear and intuitive, use dashes (-), and have a clear help text.

If a workflow is added or modified:

  • Each item in Jobs should be named in order to mark it as required.
  • If the workflow needs to be marked as required, the maintainer team must be notified.

Backward compatibility

  • Protobuf changes should be wire-compatible.
  • Changes to _vt tables and RPCs need to be backward compatible.
  • RPC changes should be compatible with vitess-operator
  • If a flag is removed, then it should also be removed from vitess-operator and arewefastyet, if used there.
  • vtctl command output order should be stable and awk-able.

@vitess-bot vitess-bot bot added NeedsBackportReason If backport labels have been applied to a PR, a justification is required NeedsDescriptionUpdate The description is not clear or comprehensive enough, and needs work NeedsIssue A linked issue is missing for this Pull Request NeedsWebsiteDocsUpdate What it says labels Jul 16, 2024
@github-actions github-actions bot added this to the v21.0.0 milestone Jul 16, 2024
@frouioui frouioui added Type: Enhancement Logical improvement (somewhere between a bug and feature) Component: Build/CI Backport to: release-18.0 Needs to be back ported to release-18.0 Backport to: release-19.0 Needs to be back ported to release-19.0 Backport to: release-20.0 Needs to be backport to release-20.0 and removed NeedsDescriptionUpdate The description is not clear or comprehensive enough, and needs work NeedsWebsiteDocsUpdate What it says NeedsIssue A linked issue is missing for this Pull Request NeedsBackportReason If backport labels have been applied to a PR, a justification is required labels Jul 16, 2024
@GrahamCampbell
Copy link
Contributor

The downside of this is that it tests release-17.0 for upgrade to 18.0, but there will never be another tag there, so probably the last 17.0 tag should be used?

@GrahamCampbell
Copy link
Contributor

GrahamCampbell commented Jul 16, 2024

Unless there were to be a change to the EOL policy to always do a final release when EOLing a branch.

@frouioui
Copy link
Member Author

There has not been a policy change regarding the lifecycle of our releases. That's a good point, we should probably use the tag in this situation.

@frouioui frouioui marked this pull request as draft July 17, 2024 17:40
@shlomi-noach shlomi-noach mentioned this pull request Jul 23, 2024
24 tasks
@systay systay mentioned this pull request Jul 23, 2024
23 tasks
@shlomi-noach shlomi-noach mentioned this pull request Jul 23, 2024
28 tasks
Copy link
Contributor

This PR is being marked as stale because it has been open for 30 days with no activity. To rectify, you may do any of the following:

  • Push additional commits to the associated branch.
  • Remove the stale label.
  • Add a comment indicating why it is not stale.

If no action is taken within 7 days, this PR will be closed.

@github-actions github-actions bot added the Stale Marks PRs as stale after a period of inactivity, which are then closed after a grace period. label Aug 17, 2024
Copy link
Contributor

This PR was closed because it has been stale for 7 days with no activity.

@github-actions github-actions bot closed this Aug 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport to: release-18.0 Needs to be back ported to release-18.0 Backport to: release-19.0 Needs to be back ported to release-19.0 Backport to: release-20.0 Needs to be backport to release-20.0 Component: Build/CI Stale Marks PRs as stale after a period of inactivity, which are then closed after a grace period. Type: Enhancement Logical improvement (somewhere between a bug and feature)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants