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

Fixes password assignment for integTest when using remote cluster #1091

Conversation

DarshitChanpura
Copy link
Member

Since the password system property was already set the value of admin, this wouldn't be changed later. This was a flaw in #1088. This PR fixes that by doing conditional assignment at 1 place.

CheckList:

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

@DarshitChanpura DarshitChanpura added backport 2.x v2.12.0 Issues targeting release v2.12.0 labels Feb 7, 2024
@DarshitChanpura
Copy link
Member Author

Can one of the maintainers create a backport 2.12 label, so that this change gets backported to 2.12?

Copy link

codecov bot commented Feb 7, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (08b3152) 74.87% compared to head (8586e95) 74.87%.

Additional details and impacted files
@@            Coverage Diff            @@
##               main    #1091   +/-   ##
=========================================
  Coverage     74.87%   74.87%           
+ Complexity     2814     2811    -3     
=========================================
  Files           367      367           
  Lines         16522    16522           
  Branches       2363     2363           
=========================================
  Hits          12371    12371           
- Misses         2847     2849    +2     
+ Partials       1304     1302    -2     

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

@bowenlan-amzn bowenlan-amzn merged commit 027509e into opensearch-project:main Feb 7, 2024
36 of 37 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 7, 2024
)

(cherry picked from commit 027509e)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link
Contributor

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

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

@bowenlan-amzn
Copy link
Member

bowenlan-amzn commented Feb 7, 2024

@DarshitChanpura can you do a manual backport please
actually I do see the PR created...

@DarshitChanpura
Copy link
Member Author

@bowenlan-amzn created a manual backport to 2.12: #1094

DarshitChanpura added a commit to DarshitChanpura/index-management that referenced this pull request Feb 7, 2024
bowenlan-amzn pushed a commit that referenced this pull request Feb 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants