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

Fixed unit tests after core added new assertion for remote metadata in index settings #726

Conversation

martin-gaievski
Copy link
Member

Description

Fix failed unit tests https://github.com/opensearch-project/neural-search/actions/runs/8903989262/job/24477559143?pr=723.
Core has added new assert for index metadata in index settings.

Check List

  • All tests pass
  • Commits are signed as 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.

…n index settings

Signed-off-by: Martin Gaievski <gaievski@amazon.com>
@martin-gaievski martin-gaievski added backport 2.x Label will add auto workflow to backport PR to 2.x branch skip-changelog backport 2.14 Backport PR to 2.14 branch labels May 1, 2024
@martin-gaievski martin-gaievski marked this pull request as ready for review May 1, 2024 18:54
@vibrantvarun
Copy link
Member

Thanks Martin for raising the fix.

@martin-gaievski
Copy link
Member Author

BWC and integTests will fail until opensearch-project/ml-commons#2382 is merged by ml-commons, we need to look on results of Gradle Check tasks

@vibrantvarun
Copy link
Member

No, BWC and integ tests will not fail now. ML commons has fixed that issue, It is just I am waiting for this PR CI checks to pass successfully and then I will close that bug.

@vibrantvarun
Copy link
Member

Just had a word with Xun. The issue still prevails

@martin-gaievski
Copy link
Member Author

Just had a word with Xun. The issue still prevails

should we wait for that issue to be fixed first, and only then merge this PR?

@vibrantvarun
Copy link
Member

We can merge this because on 2.x and 2.14 everything will pass. The issue is only when bwc version is 2.14 and current version is 3.0

@martin-gaievski martin-gaievski merged commit 2dd2e8a into opensearch-project:main May 1, 2024
73 of 107 checks passed
@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

martin-gaievski added a commit to martin-gaievski/neural-search that referenced this pull request May 1, 2024
…n index settings (opensearch-project#726)

Signed-off-by: Martin Gaievski <gaievski@amazon.com>
(cherry picked from commit 2dd2e8a)
martin-gaievski added a commit to martin-gaievski/neural-search that referenced this pull request May 1, 2024
…n index settings (opensearch-project#726)

Signed-off-by: Martin Gaievski <gaievski@amazon.com>
(cherry picked from commit 2dd2e8a)
vibrantvarun pushed a commit that referenced this pull request May 1, 2024
…n index settings (#726) (#728)

Signed-off-by: Martin Gaievski <gaievski@amazon.com>
(cherry picked from commit 2dd2e8a)
vibrantvarun pushed a commit that referenced this pull request May 1, 2024
…n index settings (#726) (#727)

Signed-off-by: Martin Gaievski <gaievski@amazon.com>
(cherry picked from commit 2dd2e8a)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Label will add auto workflow to backport PR to 2.x branch backport 2.14 Backport PR to 2.14 branch skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants