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

Add 2.9.1 to BWC and known versions #8923

Merged
merged 1 commit into from
Jul 27, 2023

Conversation

reta
Copy link
Collaborator

@reta reta commented Jul 27, 2023

Description

Fix broken BWC tests after #8897

Related Issues

N/A

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
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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: Andriy Redko <andriy.redko@aiven.io>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov
Copy link

codecov bot commented Jul 27, 2023

Codecov Report

Merging #8923 (4aa2901) into 2.x (1eea7fd) will increase coverage by 0.03%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##                2.x    #8923      +/-   ##
============================================
+ Coverage     70.78%   70.81%   +0.03%     
- Complexity    57326    57328       +2     
============================================
  Files          4745     4745              
  Lines        271063   271064       +1     
  Branches      39981    39981              
============================================
+ Hits         191862   191950      +88     
+ Misses        62770    62606     -164     
- Partials      16431    16508      +77     
Files Changed Coverage Δ
...ibs/core/src/main/java/org/opensearch/Version.java 83.25% <100.00%> (+0.51%) ⬆️

... and 444 files with indirect coverage changes

@kotwanikunal
Copy link
Member

Thanks @reta !

@kotwanikunal kotwanikunal merged commit 212dba4 into opensearch-project:2.x Jul 27, 2023
@kotwanikunal
Copy link
Member

@reta Does this need to go to main as well?

@opensearch-trigger-bot
Copy link
Contributor

The backport to main failed:

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

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-main main
# Navigate to the new working tree
pushd ../.worktrees/backport-main
# Create a new branch
git switch --create backport/backport-8923-to-main
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 212dba457d6b2d540694e040a0485529d6e52e12
# Push it to GitHub
git push --set-upstream origin backport/backport-8923-to-main
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-main

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

@reta
Copy link
Collaborator Author

reta commented Jul 27, 2023

@reta Does this need to go to main as well?

Yes! Doing just that

reta added a commit to reta/OpenSearch that referenced this pull request Jul 27, 2023
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 212dba4)
reta added a commit that referenced this pull request Jul 27, 2023
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 212dba4)
baba-devv pushed a commit to baba-devv/OpenSearch that referenced this pull request Jul 29, 2023
…arch-project#8929)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 212dba4)
kaushalmahi12 pushed a commit to kaushalmahi12/OpenSearch that referenced this pull request Sep 12, 2023
…arch-project#8929)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 212dba4)
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>
brusic pushed a commit to brusic/OpenSearch that referenced this pull request Sep 25, 2023
…arch-project#8929)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 212dba4)
Signed-off-by: Ivan Brusic <ivan.brusic@flocksafety.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…arch-project#8929)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 212dba4)
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants