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

Adding dual cluster arg to gradle run #1441

Merged
merged 1 commit into from
Mar 19, 2025

Conversation

amitgalitz
Copy link
Member

@amitgalitz amitgalitz commented Mar 18, 2025

Description

Added the ability to run AD locally with 2 clusters, each with there own http and transport ports (9200/9300 and 9201/9301). This allows to easily test cross cluster features.

  • added ignoring dependabot PRs for changelog verifier

Check List

  • 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.

Sorry, something went wrong.

@opensearch-trigger-bot opensearch-trigger-bot bot added documentation Improvements or additions to documentation infra Changes to infrastructure, testing, CI/CD, pipelines, etc. backport 2.x labels Mar 18, 2025
Copy link

codecov bot commented Mar 18, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.58%. Comparing base (03637f1) to head (b2e66e2).
Report is 1 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff              @@
##               main    #1441      +/-   ##
============================================
- Coverage     81.67%   81.58%   -0.09%     
+ Complexity     5876     5863      -13     
============================================
  Files           533      533              
  Lines         23669    23669              
  Branches       2374     2374              
============================================
- Hits          19331    19310      -21     
- Misses         3182     3199      +17     
- Partials       1156     1160       +4     
Flag Coverage Δ
plugin 81.58% <ø> (-0.09%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

see 10 files with indirect coverage changes

🚀 New features to boost your workflow:
  • Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@kaituo
Copy link
Collaborator

kaituo commented Mar 18, 2025

@amitgalitz Can you resolve merge conflicts?

@amitgalitz
Copy link
Member Author

@amitgalitz Can you resolve merge conflicts?

yes, didn't notice we merged Craig's PR

Signed-off-by: Amit Galitzky <amgalitz@amazon.com>
@amitgalitz amitgalitz merged commit b7af712 into opensearch-project:main Mar 19, 2025
25 checks passed
@opensearch-trigger-bot
Copy link

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

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

amitgalitz added a commit to amitgalitz/anomaly-detection-1 that referenced this pull request Mar 20, 2025
Signed-off-by: Amit Galitzky <amgalitz@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport-failed documentation Improvements or additions to documentation infra Changes to infrastructure, testing, CI/CD, pipelines, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants