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

Backport/backport lots of prs for discover 2.0 #9218

Closed

Conversation

angle943
Copy link
Collaborator

@angle943 angle943 commented Jan 18, 2025

Description

Backports #8995 #9006 #9027 #9048 #9049 #9051 #9060 #9074 #9079 #9082 #9112 #9113 #9119 #9129 #9135 #9151 #9166 #9197 #9200 #9208 #9212 #9213 #9219 #9220

Also backports #8799 #9153

There is an issue with selecting INDEXES as datasets in 2.x. This issue does not exist in main. I added SKIP on those tests

Changelog

  • skip

Check List

  • All tests pass
    • yarn test:jest
    • yarn test:jest_integration
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

@github-actions github-actions bot added the Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry label Jan 18, 2025
Copy link

codecov bot commented Jan 18, 2025

Codecov Report

Attention: Patch coverage is 52.00000% with 12 lines in your changes missing coverage. Please review.

Project coverage is 61.14%. Comparing base (368e6f3) to head (953823c).
Report is 3 commits behind head on 2.x.

Files with missing lines Patch % Lines
...ugins/data/public/ui/query_editor/query_editor.tsx 0.00% 3 Missing ⚠️
...over/public/application/components/chart/chart.tsx 0.00% 3 Missing ⚠️
...ry/query_string/dataset_service/dataset_service.ts 85.71% 0 Missing and 1 partial ⚠️
...ta/public/ui/dataset_selector/dataset_explorer.tsx 0.00% 1 Missing ⚠️
...lugins/data/public/ui/saved_query_form/helpers.tsx 0.00% 1 Missing ⚠️
...i/saved_query_management/saved_query_list_item.tsx 0.00% 1 Missing ⚠️
...failure_modal/shard_failure_description_header.tsx 0.00% 1 Missing ⚠️
...c/application/components/no_results/no_results.tsx 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##              2.x    #9218      +/-   ##
==========================================
+ Coverage   61.12%   61.14%   +0.01%     
==========================================
  Files        3816     3816              
  Lines       91517    91520       +3     
  Branches    14452    14458       +6     
==========================================
+ Hits        55943    55957      +14     
+ Misses      32013    32002      -11     
  Partials     3561     3561              
Flag Coverage Δ
Linux_1 29.13% <0.00%> (-0.01%) ⬇️
Linux_2 56.59% <ø> (ø)
Linux_3 38.07% <36.84%> (+0.01%) ⬆️
Linux_4 29.19% <33.33%> (+<0.01%) ⬆️
Windows_1 29.14% <0.00%> (-0.01%) ⬇️
Windows_2 56.54% <ø> (ø)
Windows_3 38.07% <36.84%> (+0.01%) ⬆️
Windows_4 29.19% <33.33%> (+<0.01%) ⬆️

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.

@abbyhu2000
Copy link
Member

#8913 this auto-backport has been merged

@abbyhu2000
Copy link
Member

I think #9113 needs to be included too. It depends on #8995 and #9048 that are already included in your list.

@abbyhu2000
Copy link
Member

#9197 also needs to be included?

@abbyhu2000
Copy link
Member

and this #9208

@abbyhu2000
Copy link
Member

#9220 another one that just got merged today

@angle943
Copy link
Collaborator Author

angle943 commented Jan 21, 2025

@abbyhu2000 i addressed all your comments and also backporeted #9219 (also updated the description to show correct list)

Copy link
Member

@zhongnansu zhongnansu left a comment

Choose a reason for hiding this comment

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

I don't think backporting a bunch of PRs in one PR is good practice here. 1.5 millions lines of code in one commit will make things hard to trace.
Why can't we use the automation we built by applying backport labels to each PR?

@ananzh
Copy link
Member

ananzh commented Jan 22, 2025

ciGroup9 failure is a known issue and fixed in opensearch-project/opensearch-dashboards-functional-test#1677

@angle943
Copy link
Collaborator Author

Several of CIGroup10's test failure attributable to missing backport of #8799. Added it here

@ananzh
Copy link
Member

ananzh commented Jan 22, 2025

@zhongnansu Thanks for the comment. You are absolutely right. These PRs are all cypress tests related and dependent on each other. Previously some of them are deployed in feature branch then moved to main. Therefore, we prefer backport them as one PR for this special case.

@ananzh
Copy link
Member

ananzh commented Jan 23, 2025

close this due to #9261

@ananzh ananzh closed this Jan 23, 2025
@angle943 angle943 deleted the backport/backport-lots-of-prs branch January 23, 2025 23:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants