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: CI flow on windows main #145

Merged
merged 5 commits into from
Nov 29, 2023

Conversation

SuZhou-Joe
Copy link
Member

@SuZhou-Joe SuZhou-Joe commented Nov 29, 2023

Description

  1. Fix timeout issue in windows by increasing requestTimeout to 12000s.
  2. Upload opensearch.log for future debug. The log file is about 80kb.

Issues Resolved

[List any issues this PR will resolve]

Check List

  • 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: SuZhou-Joe <[email protected]>
Copy link

codecov bot commented Nov 29, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (7aba242) 86.70% compared to head (f8d3164) 86.70%.
Report is 1 commits behind head on main.

❗ Current head f8d3164 differs from pull request most recent head 0d09c80. Consider uploading reports for the commit 0d09c80 to get more accurate results

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #145   +/-   ##
=======================================
  Coverage   86.70%   86.70%           
=======================================
  Files          52       52           
  Lines        1497     1497           
  Branches      360      360           
=======================================
  Hits         1298     1298           
  Misses        196      196           
  Partials        3        3           
Flag Coverage Δ
dashboards-notifications 86.70% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

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

Signed-off-by: SuZhou-Joe <[email protected]>
Signed-off-by: SuZhou-Joe <[email protected]>
Copy link
Member

@zhichao-aws zhichao-aws left a comment

Choose a reason for hiding this comment

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

lgtm

@SuZhou-Joe SuZhou-Joe merged commit 15c0b72 into opensearch-project:main Nov 29, 2023
4 of 6 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/dashboards-notifications/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/dashboards-notifications/backport-2.x
# Create a new branch
git switch --create backport/backport-145-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 15c0b72ac44919d691dc459fc61d1f6d6983318c
# Push it to GitHub
git push --set-upstream origin backport/backport-145-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-notifications/backport-2.x

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

SuZhou-Joe added a commit to SuZhou-Joe/dashboards-notifications that referenced this pull request Nov 29, 2023
* feat: remove useless step

Signed-off-by: SuZhou-Joe <[email protected]>

* feat: add opensearch logs

Signed-off-by: SuZhou-Joe <[email protected]>

* feat: update

Signed-off-by: SuZhou-Joe <[email protected]>

* feat: add more requestTimeout

Signed-off-by: SuZhou-Joe <[email protected]>

---------

Signed-off-by: SuZhou-Joe <[email protected]>
Co-authored-by: Hailong Cui <[email protected]>
(cherry picked from commit 15c0b72)
yuye-aws pushed a commit that referenced this pull request Nov 30, 2023
* Fix: CI flow on windows main (#145)

* feat: remove useless step

Signed-off-by: SuZhou-Joe <[email protected]>

* feat: add opensearch logs

Signed-off-by: SuZhou-Joe <[email protected]>

* feat: update

Signed-off-by: SuZhou-Joe <[email protected]>

* feat: add more requestTimeout

Signed-off-by: SuZhou-Joe <[email protected]>

---------

Signed-off-by: SuZhou-Joe <[email protected]>
Co-authored-by: Hailong Cui <[email protected]>
(cherry picked from commit 15c0b72)

* feat: add missing step

Signed-off-by: SuZhou-Joe <[email protected]>

* feat: add variable NOTIFICATIONS_PLUGIN_VERSION

Signed-off-by: SuZhou-Joe <[email protected]>

* feat: remove upload opensearch.log

Signed-off-by: SuZhou-Joe <[email protected]>

---------

Signed-off-by: SuZhou-Joe <[email protected]>
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.

3 participants