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 path.repo for registering snapshot repository in integ tests #2461

Merged
merged 1 commit into from
Jan 29, 2025

Conversation

anntians
Copy link
Contributor

Description

A prior PR #2445 was breaking the release build of 2.19 due to #2458. This PR fixes the issue by updating the path.repo used to register snapshot repositories in integ tests

Related Issues

Resolves #2458

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

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.

@anntians
Copy link
Contributor Author

This PR is a fix for a previous PR #2445. Can I get help with adding the skip-changelog label to this PR. Thanks

@shatejas
Copy link
Collaborator

Looks good, waiting for CI runs to approve

@anntians
Copy link
Contributor Author

Can I get help adding a backport main label to this PR? Thanks

@VijayanB VijayanB merged commit 168ee3c into opensearch-project:2.x Jan 29, 2025
104 of 117 checks passed
@opensearch-trigger-bot
Copy link
Contributor

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

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

anntians added a commit to anntians/k-NN that referenced this pull request Jan 29, 2025
…nsearch-project#2461)

Signed-off-by: AnnTian Shao <[email protected]>
Co-authored-by: AnnTian Shao <[email protected]>
(cherry picked from commit 168ee3c)
anntians added a commit to anntians/k-NN that referenced this pull request Jan 30, 2025
…nsearch-project#2461)

Signed-off-by: AnnTian Shao <[email protected]>
Co-authored-by: AnnTian Shao <[email protected]>
(cherry picked from commit 168ee3c)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants