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

Forward port 2.14 release notes to main #13589

Merged

Conversation

andrross
Copy link
Member

@andrross andrross commented May 7, 2024

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)
  • Public documentation issue/PR created

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.

Copy link
Contributor

github-actions bot commented May 7, 2024

❌ Gradle check result for 1f2dcf7: null

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@andrross andrross added the backport 2.x Backport to 2.x branch label May 7, 2024
Copy link
Contributor

github-actions bot commented May 7, 2024

❕ Gradle check result for 1f2dcf7: UNSTABLE

  • TEST FAILURES:
      1 org.opensearch.index.IndexServiceTests.testAsyncTranslogTrimTaskOnClosedIndex

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

Copy link

codecov bot commented May 7, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.71%. Comparing base (b15cb0c) to head (1f2dcf7).
Report is 271 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #13589      +/-   ##
============================================
+ Coverage     71.42%   71.71%   +0.29%     
- Complexity    59978    61174    +1196     
============================================
  Files          4985     5052      +67     
  Lines        282275   287139    +4864     
  Branches      40946    41606     +660     
============================================
+ Hits         201603   205928    +4325     
- Misses        63999    64224     +225     
- Partials      16673    16987     +314     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@reta reta merged commit 4eb33b0 into opensearch-project:main May 7, 2024
73 of 74 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-13589-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4eb33b0720abe67d644d8e8abfff4667ecd531fe
# Push it to GitHub
git push --set-upstream origin backport/backport-13589-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-13589-to-2.x.

@andrross andrross deleted the forwardport-2.14-release-notes branch May 7, 2024 21:28
andrross added a commit to andrross/OpenSearch that referenced this pull request May 7, 2024
reta pushed a commit that referenced this pull request May 8, 2024
Signed-off-by: Andrew Ross <[email protected]>
(cherry picked from commit 4eb33b0)
rayshrey pushed a commit to rayshrey/OpenSearch that referenced this pull request May 9, 2024
finnegancarroll pushed a commit to finnegancarroll/OpenSearch that referenced this pull request May 10, 2024
deshsidd pushed a commit to deshsidd/OpenSearch that referenced this pull request May 17, 2024
parv0201 pushed a commit to parv0201/OpenSearch that referenced this pull request Jun 10, 2024
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