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 compare logic to opensearch build libraries #478

Merged
merged 4 commits into from
Aug 8, 2024

Conversation

OVI3D0
Copy link
Member

@OVI3D0 OVI3D0 commented Aug 7, 2024

Description

Add compare logic to opensearch build libraries, update benchmark tests, create tests for compare commands.

Issues Resolved

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.

@OVI3D0 OVI3D0 marked this pull request as ready for review August 7, 2024 20:30
@@ -71,44 +78,60 @@ void call(Map args = [:]) {
editBenchmarkConfig("${WORKSPACE}/benchmark.ini")
String userTags = getMetadataTags(args.userTag.toString(), buildManifest)
Copy link
Collaborator

@rishabh6788 rishabh6788 Aug 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move this inside the execute-test if logic. And the above if-else logic as well.

 if (args.insecure.toBoolean()) {
                sleep(5)
            } else {
                sleep(120)
            }

These are not required for compare, args.insecure.toBoolean() will result in error if not passed.

Copy link

codecov bot commented Aug 7, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 84.32%. Comparing base (f482df7) to head (1ecc724).

Additional details and impacted files
@@             Coverage Diff              @@
##               main     #478      +/-   ##
============================================
+ Coverage     84.29%   84.32%   +0.03%     
  Complexity       80       80              
============================================
  Files           107      108       +1     
  Lines           522      523       +1     
  Branches         61       61              
============================================
+ Hits            440      441       +1     
  Misses           26       26              
  Partials         56       56              

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

@rishabh6788
Copy link
Collaborator

I think it will be cleaner to have dedicated LibTester class for compare logic and use the same in related TEST file, won't have to touch the existing test files.

@rishabh6788
Copy link
Collaborator

Also bump version to 6.8.1 here in this PR.

Copy link
Collaborator

@rishabh6788 rishabh6788 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@rishabh6788 rishabh6788 merged commit 6b367e5 into opensearch-project:main Aug 8, 2024
9 checks passed
@opensearch-trigger-bot
Copy link

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

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

rishabh6788 pushed a commit that referenced this pull request Aug 8, 2024
Signed-off-by: Michael Oviedo <[email protected]>
(cherry picked from commit 6b367e5)
rishabh6788 added a commit that referenced this pull request Aug 8, 2024
@opensearch-trigger-bot
Copy link

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

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

rishabh6788 pushed a commit that referenced this pull request Aug 8, 2024
Signed-off-by: Michael Oviedo <[email protected]>
(cherry picked from commit 6b367e5)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

2 participants