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

Tweak dir path for osd after untar #688

Merged

Conversation

peterzhuamazon
Copy link
Member

Description

Tweak dir path for osd after untar

Issues Resolved

#676 follow up

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.

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
@peterzhuamazon
Copy link
Member Author

The snapshot failure is expected and waiting for #681, while #681 waiting for this PR to be merged.

@peterzhuamazon peterzhuamazon merged commit 38ee80e into opensearch-project:main May 26, 2023
@peterzhuamazon peterzhuamazon deleted the tweak-new-packagejson branch May 26, 2023 19:59
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 failed:

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

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

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

opensearch-trigger-bot bot pushed a commit that referenced this pull request May 26, 2023
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 38ee80e)
peterzhuamazon added a commit to peterzhuamazon/opensearch-dashboards-functional-test that referenced this pull request May 26, 2023
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
peterzhuamazon added a commit that referenced this pull request May 26, 2023
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 38ee80e)

Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
peterzhuamazon added a commit that referenced this pull request May 26, 2023
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
leanneeliatra pushed a commit to leanneeliatra/opensearch-dashboards-functional-test-fork that referenced this pull request Sep 15, 2023
…ch-project#689)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 38ee80e)

Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: leanne.laceybyrne@eliatra.com <leanne.laceybyrne@eliatra.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.3 backport 2.x bug Something isn't working
Projects
Development

Successfully merging this pull request may close these issues.

5 participants