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

Fix IT run error by adding job-scheduler back to zipArchive dependency #85

Merged
merged 1 commit into from
Dec 29, 2023

Conversation

zane-neo
Copy link
Collaborator

Description

Change back the job-scheduler dependency to zipArchive because when running IT on local, we need install job-scheduler plugin and using jar dependency will need extra effort to complete this, using zipArchive dependency would be simple enough to solve this.

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.

Copy link

codecov bot commented Dec 29, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (bc835a0) 81.29% compared to head (93de36e) 81.29%.

Additional details and impacted files
@@            Coverage Diff            @@
##               main      #85   +/-   ##
=========================================
  Coverage     81.29%   81.29%           
  Complexity      152      152           
=========================================
  Files            12       12           
  Lines           882      882           
  Branches        115      115           
=========================================
  Hits            717      717           
  Misses          106      106           
  Partials         59       59           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@zane-neo zane-neo merged commit 051b79a into opensearch-project:main Dec 29, 2023
16 checks passed
@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/backport-85-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 051b79abaacedd8429c1c878813e27014fe476f9
# Push it to GitHub
git push --set-upstream origin backport/backport-85-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/backport-85-to-2.x.

@zhichao-aws
Copy link
Member

@zane-neo The automatic backport fails, could you please do a manual backport to sync how we handle js dependency in 2.x?

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.

2 participants