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

[2.x] Add bwc version 1.3.3 #3221

Merged

Conversation

tlfeng
Copy link
Collaborator

@tlfeng tlfeng commented May 6, 2022

Description

Port the commit 7d19426 / PR #3204 to 2.x branch.

Adding the new 1.3.3 version into .ci/bwcVersions can make BWC test for existing 2.x versions run against the new 1.3.3 version.

Issues Resolved

Related to issue #3218

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Tianli Feng <ftianli@amazon.com>
@tlfeng tlfeng requested a review from a team as a code owner May 6, 2022 04:40
@tlfeng tlfeng added v2.1.0 Issues and PRs related to version 2.1.0 backport 2.0 Backport to 2.0 branch labels May 6, 2022
@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Check success 0dffa1f
Log 5078

Reports 5078

@saratvemulapalli
Copy link
Member

Thanks @tlfeng for this!

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.0 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.0 2.0
# Navigate to the new working tree
cd .worktrees/backport-2.0
# Create a new branch
git switch --create backport/backport-3221-to-2.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 2002912e619e53c5a050701dda949c94a6c58a55
# Push it to GitHub
git push --set-upstream origin backport/backport-3221-to-2.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.0

Then, create a pull request where the base branch is 2.0 and the compare/head branch is backport/backport-3221-to-2.0.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.0 Backport to 2.0 branch v2.1.0 Issues and PRs related to version 2.1.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants