-
Notifications
You must be signed in to change notification settings - Fork 29
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
Fix build error due to upstream change #316
Conversation
Signed-off-by: Hailong Cui <[email protected]>
Signed-off-by: Hailong Cui <[email protected]>
Signed-off-by: Hailong Cui <[email protected]>
integTest failed due to, that will need to a fix at AD side, raise PR opensearch-project/anomaly-detection#1221
|
@@ -126,7 +126,7 @@ dependencies { | |||
// Plugin dependencies | |||
compileOnly group: 'org.opensearch', name:'opensearch-ml-client', version: "${opensearch_build}" | |||
implementation fileTree(dir: jsJarDirectory, include: ["opensearch-job-scheduler-${opensearch_build}.jar"]) | |||
implementation fileTree(dir: adJarDirectory, include: ["opensearch-time-series-analytics-${opensearch_build}.jar"]) | |||
implementation fileTree(dir: adJarDirectory, include: ["opensearch-anomaly-detection-${opensearch_build}.jar"]) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
AD team plans to change the jar name from opensearch-anomaly-detection
to opensearch-time-series-analytics
, but main and 2.x and release branch are not consistent, during 2.14 release, this inconsistency caused skills failed to build. @kaituo can you confirm which name will be using in main and 2.x in 2.15 release?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@zane-neo please help to re-run the CI, class cast exception fixed in AD and i could pass the build in my local. |
Signed-off-by: Hailong Cui <[email protected]>
Signed-off-by: Hailong Cui <[email protected]>
The backport to
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/skills/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/skills/backport-2.x
# Create a new branch
git switch --create backport/backport-316-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 62ac87fa63a41fa460ae3795cdeaf1db927d1588
# Push it to GitHub
git push --set-upstream origin backport/backport-316-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/skills/backport-2.x Then, create a pull request where the |
* fix build error due to upstream change Signed-off-by: Hailong Cui <[email protected]> * failed unit test Signed-off-by: Hailong Cui <[email protected]> * fix compile error Signed-off-by: Hailong Cui <[email protected]> * fix flaky test for locale mr Signed-off-by: Hailong Cui <[email protected]> * force to use x86_64 for macos Signed-off-by: Hailong Cui <[email protected]> --------- Signed-off-by: Hailong Cui <[email protected]> (cherry picked from commit 62ac87f)
* fix build error due to upstream change Signed-off-by: Hailong Cui <[email protected]> * failed unit test Signed-off-by: Hailong Cui <[email protected]> * fix compile error Signed-off-by: Hailong Cui <[email protected]> * fix flaky test for locale mr Signed-off-by: Hailong Cui <[email protected]> * force to use x86_64 for macos Signed-off-by: Hailong Cui <[email protected]> --------- Signed-off-by: Hailong Cui <[email protected]> (cherry picked from commit 62ac87f)
Description
Fix build error due to upstream changes
opensearch-project/common-utils#655
opensearch-project/anomaly-detection#1210
Issues Resolved
#311
Check List
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.