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

Include ML zip dependency in integTest and run tasks #34

Merged
merged 3 commits into from
Dec 18, 2023

Conversation

ohltyler
Copy link
Member

@ohltyler ohltyler commented Dec 18, 2023

Description

Uses zipArchive to pull an ML plugin zip to use in the integTest cluster, and utilized this same cluster when running ./gradlew run. The impact of this is quicker testing on a local cluster via ./gradlew run without having to replace zips on a tarball of core OpenSearch, for example.

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • 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: Tyler Ohlsen <ohltyler@amazon.com>
Signed-off-by: Tyler Ohlsen <ohltyler@amazon.com>
Signed-off-by: Tyler Ohlsen <ohltyler@amazon.com>
Copy link
Member

@joshuali925 joshuali925 left a comment

Choose a reason for hiding this comment

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

could this also be backported to 2.x?

@ohltyler
Copy link
Member Author

could this also be backported to 2.x?

Yes

@ohltyler ohltyler merged commit 62c9754 into opensearch-project:main Dec 18, 2023
11 of 12 checks passed
@ohltyler ohltyler deleted the ad-tool branch December 18, 2023 21:27
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

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-34-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 62c9754a5926d06e648149114a14c0155ca660bd
# Push it to GitHub
git push --set-upstream origin backport-34-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 base branch is 2.x and the compare/head branch is backport-34-to-2.x.

@ohltyler
Copy link
Member Author

@joshuali925 I will do a manual backport

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.

4 participants