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

[Backport 2.13] Manual backport PR with conflict fixes for adding ml_commons version #3319

Merged

Conversation

pyek-bot
Copy link
Contributor

Description

Backports a commit to 2.13: #3123

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.

@@ -266,7 +266,7 @@ List<String> jacocoExclusions = [
'org.opensearch.ml.profile.MLPredictRequestStats',
'org.opensearch.ml.action.deploy.TransportDeployModelAction',
'org.opensearch.ml.action.deploy.TransportDeployModelOnNodeAction',
'org.opensearch.ml.action.undeploy.TransportUndeployModelsAction',
'org.opensearch.ml.action.undeploy.TransportUndeployModelsAction',
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it the empty space causing auto backport failure?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, there are other conflicts as well. I am cherry-picking a commit from 2.14 to 2.13, the cherry-picked commit has some references to a constant VERSION_2_14 which causes issues in 2.13.

@pyek-bot
Copy link
Contributor Author

pyek-bot commented Jan 3, 2025

flaky tests are failing:

Tests with failures:
91 tests completed, 2 failed, 9 skipped
 - org.opensearch.ml.rest.RestMLRAGSearchProcessorIT.testOpenAITextEmbeddingModel_ISO8859_1
 - org.opensearch.ml.rest.RestMLRemoteInferenceIT.testOpenAITextEmbeddingModel_ISO8859_1

Please re-run tests!

pyek-bot and others added 2 commits January 3, 2025 12:24
…ompatible version (opensearch-project#2486) (opensearch-project#2523) (opensearch-project#3123)

* [Feature/multi_tenancy] Remove strict version dependency to compile minimum compatible version (opensearch-project#2485)

* Remove strict version dependency to compile minimum compatible version

* Only declare version constants once

---------

* Remove unnecessary dependency

* remove space

---------

(cherry picked from commit 954e8b3)

Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Sicheng Song <[email protected]>
Signed-off-by: Pavan Yekbote <[email protected]>
@pyek-bot pyek-bot force-pushed the add_ml_commons_version_commit branch from 8aef2d7 to b79e738 Compare January 3, 2025 20:25
@pyek-bot pyek-bot had a problem deploying to ml-commons-cicd-env January 3, 2025 20:25 — with GitHub Actions Failure
@pyek-bot pyek-bot had a problem deploying to ml-commons-cicd-env January 3, 2025 20:25 — with GitHub Actions Failure
Zhangxunmt
Zhangxunmt previously approved these changes Jan 6, 2025
@pyek-bot pyek-bot had a problem deploying to ml-commons-cicd-env January 6, 2025 19:55 — with GitHub Actions Failure
@pyek-bot pyek-bot had a problem deploying to ml-commons-cicd-env January 6, 2025 20:22 — with GitHub Actions Failure
Signed-off-by: Pavan Yekbote <[email protected]>
@pyek-bot pyek-bot had a problem deploying to ml-commons-cicd-env January 9, 2025 21:53 — with GitHub Actions Failure
@pyek-bot pyek-bot temporarily deployed to ml-commons-cicd-env January 9, 2025 21:53 — with GitHub Actions Inactive
@pyek-bot pyek-bot temporarily deployed to ml-commons-cicd-env January 9, 2025 21:53 — with GitHub Actions Inactive
@pyek-bot pyek-bot temporarily deployed to ml-commons-cicd-env January 9, 2025 21:53 — with GitHub Actions Inactive
@pyek-bot pyek-bot had a problem deploying to ml-commons-cicd-env January 9, 2025 22:40 — with GitHub Actions Failure
@b4sjoo b4sjoo merged commit 5c4bd3a into opensearch-project:2.13 Jan 9, 2025
8 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants