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 testPluginInstalled failure #92

Merged
merged 1 commit into from
Oct 13, 2023

Conversation

owaiskazi19
Copy link
Member

Description

Another attempt to fix testPluginInstalled() test on Windows.

Issues Resolved

Another attempt for #87

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: Owais Kazi <owaiskazi19@gmail.com>
@codecov
Copy link

codecov bot commented Oct 13, 2023

Codecov Report

Merging #92 (6a459c2) into main (b1fbe0b) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main      #92   +/-   ##
=========================================
  Coverage     81.68%   81.68%           
  Complexity      285      285           
=========================================
  Files            30       30           
  Lines          1119     1119           
  Branches        125      125           
=========================================
  Hits            914      914           
  Misses          160      160           
  Partials         45       45           

@amitgalitz
Copy link
Member

amitgalitz commented Oct 13, 2023

was this tested on a windows machine? I see the previous PR also passed the windows CI check. Did it just pass cause we didn't have any tests?

@owaiskazi19
Copy link
Member Author

was this tested on a windows machine? I see the previous PR also passed the windows CI check. Did it just pass cause we didn't have any tests?

Previous PR's backport PR failed on 2.x windows CI. All the attempts are to fix it on 2.x

@owaiskazi19 owaiskazi19 merged commit 1b856de into opensearch-project:main Oct 13, 2023
11 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/opensearch-ai-flow-framework/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/opensearch-ai-flow-framework/backport-2.x
# Create a new branch
git switch --create backport/backport-92-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1b856deadeccfe0b87e572d8cfbb6909da70d1c7
# Push it to GitHub
git push --set-upstream origin backport/backport-92-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/opensearch-ai-flow-framework/backport-2.x

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

owaiskazi19 added a commit to owaiskazi19/opensearch-ai-flow-framework that referenced this pull request Oct 13, 2023
owaiskazi19 added a commit to owaiskazi19/opensearch-ai-flow-framework that referenced this pull request Oct 13, 2023
(cherry picked from commit 1b856de)
Signed-off-by: Owais Kazi <owaiskazi19@gmail.com>
dbwiddis pushed a commit that referenced this pull request Oct 14, 2023
Fixed testPluginInstalled failure (#92)

(cherry picked from commit 1b856de)
Signed-off-by: Owais Kazi <owaiskazi19@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport PRs to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants