Skip to content

[Backport-2.x] Fix CodecTests#8591

Merged
reta merged 1 commit intoopensearch-project:2.xfrom
sarthakaggarwal97:backport/backport-8312-to-2.x-t
Jul 10, 2023
Merged

[Backport-2.x] Fix CodecTests#8591
reta merged 1 commit intoopensearch-project:2.xfrom
sarthakaggarwal97:backport/backport-8312-to-2.x-t

Conversation

@sarthakaggarwal97
Copy link
Copy Markdown
Contributor

@sarthakaggarwal97 sarthakaggarwal97 commented Jul 10, 2023

Description

Fixes CodecTests for backported PR #8312

Related Issues

Resolves #7555

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.

@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

@sarthakaggarwal97 sarthakaggarwal97 force-pushed the backport/backport-8312-to-2.x-t branch 2 times, most recently from b57b13b to 3343a50 Compare July 10, 2023 18:00
@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

Signed-off-by: Sarthak Aggarwal <sarthagg@amazon.com>
@sarthakaggarwal97 sarthakaggarwal97 force-pushed the backport/backport-8312-to-2.x-t branch from 3343a50 to 48ca263 Compare July 10, 2023 18:34
@sarthakaggarwal97 sarthakaggarwal97 changed the title Fixing CodecTests Fix CodecTests Jul 10, 2023
@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

@reta
Copy link
Copy Markdown
Contributor

reta commented Jul 10, 2023

@sarthakaggarwal97 should we move it from draft state? or there is something else to fix?

@owaiskazi19
Copy link
Copy Markdown
Member

@reta good to go?

@reta
Copy link
Copy Markdown
Contributor

reta commented Jul 10, 2023

Thank you @sarthakaggarwal97 !

@owaiskazi19 owaiskazi19 added the backport 2.x Backport to 2.x branch label Jul 10, 2023
@opensearch-trigger-bot
Copy link
Copy Markdown
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:

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

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

@owaiskazi19
Copy link
Copy Markdown
Member

@sarthakaggarwal97 can you raise a manual PR to 2.x?

@sarthakaggarwal97
Copy link
Copy Markdown
Contributor Author

@sarthakaggarwal97 can you raise a manual PR to 2.x?

@owaiskazi19 this PR into 2.x itself. We don't need a backport

@owaiskazi19 owaiskazi19 changed the title Fix CodecTests [Backport-2.x] Fix CodecTests Jul 11, 2023
@owaiskazi19
Copy link
Copy Markdown
Member

@owaiskazi19 this PR into 2.x itself. We don't need a backport

Ah my bad. Thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 2.x Backport to 2.x branch skip-changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants