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

[CI/CD] Add single version flag during bootstrap to fix version conflicts and update the snapshots #1454

Merged
merged 3 commits into from
Feb 20, 2024

Conversation

RyanL1997
Copy link
Collaborator

@RyanL1997 RyanL1997 commented Feb 19, 2024

Description

Issues Resolved

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc 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
Collaborator

@derek-ho derek-ho left a comment

Choose a reason for hiding this comment

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

Thanks

@RyanL1997
Copy link
Collaborator Author

@mengweieric @ps48 Should we merge this one? Seems like the failure is irrelevant from the bootstrap issue.

@RyanL1997
Copy link
Collaborator Author

Just double check with @joshuali925 , and it seems like the build failure of snapshot is related to an upstream change. And we are trying to add the fix into this PR too.

Signed-off-by: Joshua Li <[email protected]>
@RyanL1997 RyanL1997 changed the title [CI/CD] Add single version flag during bootstrap to fix version conflicts [CI/CD] Add single version flag during bootstrap to fix version conflicts and update the snapshot Feb 19, 2024
@RyanL1997 RyanL1997 changed the title [CI/CD] Add single version flag during bootstrap to fix version conflicts and update the snapshot [CI/CD] Add single version flag during bootstrap to fix version conflicts and update the snapshots Feb 19, 2024
Copy link

codecov bot commented Feb 20, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (29e1b42) 54.68% compared to head (281e763) 56.55%.
Report is 6 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1454      +/-   ##
==========================================
+ Coverage   54.68%   56.55%   +1.87%     
==========================================
  Files         317      320       +3     
  Lines       11373    11720     +347     
  Branches     3028     3042      +14     
==========================================
+ Hits         6219     6628     +409     
+ Misses       5103     5040      -63     
- Partials       51       52       +1     
Flag Coverage Δ
dashboards-observability 56.55% <ø> (+1.87%) ⬆️

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.

@joshuali925 joshuali925 merged commit 7e2d951 into opensearch-project:main Feb 20, 2024
19 of 23 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-observability/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/dashboards-observability/backport-2.x
# Create a new branch
git switch --create backport/backport-1454-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7e2d951fef1b639160ec10102496bd6c36349242
# Push it to GitHub
git push --set-upstream origin backport/backport-1454-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-observability/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1454-to-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.

6 participants