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

4.20.merge #10013

Closed
wants to merge 0 commits into from
Closed

4.20.merge #10013

wants to merge 0 commits into from

Conversation

DaanHoogland
Copy link
Contributor

Description

This PR...

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)
  • build/CI
  • test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

@DaanHoogland
Copy link
Contributor Author

@vishesh92 @JoaoJandre @weizhouapache @rohityadavcloud @GutoVeronezi @rp- @nvazquez @Pearl1594 @bernardodemarco @sureshanaparti @FelipeM525 @RodrigoDLopez @winterhazel

this is a days worth of merging and fixing test failures. I think it is ok, and usually I just push but in this case I think a bunch of review is in order.

Copy link

codecov bot commented Nov 29, 2024

Codecov Report

Attention: Patch coverage is 38.67188% with 314 lines in your changes missing coverage. Please review.

Project coverage is 15.82%. Comparing base (c63c7ee) to head (c71c0b6).
Report is 5 commits behind head on 4.20.

Files with missing lines Patch % Lines
.../LibvirtImportConvertedInstanceCommandWrapper.java 55.49% 69 Missing and 16 partials ⚠️
.../hypervisor/kvm/storage/LinstorStorageAdaptor.java 0.00% 31 Missing ⚠️
...java/com/cloud/network/rules/RulesManagerImpl.java 0.00% 30 Missing ⚠️
...loud/agent/api/ImportConvertedInstanceCommand.java 0.00% 24 Missing ⚠️
.../network/rules/dao/PortForwardingRulesDaoImpl.java 0.00% 24 Missing ⚠️
...ervisor/kvm/resource/LibvirtComputingResource.java 0.00% 20 Missing ⚠️
...om/cloud/network/firewall/FirewallManagerImpl.java 52.94% 9 Missing and 7 partials ⚠️
...m/cloud/network/dao/FirewallRulesCidrsDaoImpl.java 0.00% 11 Missing ⚠️
...om/cloud/hypervisor/kvm/resource/LibvirtVMDef.java 16.66% 10 Missing ⚠️
...cloud/agent/api/ImportConvertedInstanceAnswer.java 18.18% 9 Missing ⚠️
... and 15 more
Additional details and impacted files
@@             Coverage Diff              @@
##               4.20   #10013      +/-   ##
============================================
+ Coverage     15.80%   15.82%   +0.02%     
- Complexity    12586    12623      +37     
============================================
  Files          5627     5630       +3     
  Lines        492343   492778     +435     
  Branches      59694    59745      +51     
============================================
+ Hits          77828    77996     +168     
- Misses       405992   406248     +256     
- Partials       8523     8534      +11     
Flag Coverage Δ
uitests 4.03% <ø> (-0.01%) ⬇️
unittests 16.65% <38.67%> (+0.02%) ⬆️

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.

Copy link
Contributor

@rp- rp- left a comment

Choose a reason for hiding this comment

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

I did only go trough kvm and linstor changes

@weizhouapache
Copy link
Member

@DaanHoogland
I think we can merge (not "Squash and merge") ?

@DaanHoogland
Copy link
Contributor Author

@DaanHoogland I think we can merge (not "Squash and merge") ?

I am not sure but I think we have to redo once we found all the issues. (already newer merges on 4.20

Copy link
Collaborator

@bernardodemarco bernardodemarco left a comment

Choose a reason for hiding this comment

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

Changes related to #9966, #9759, and #9927 look good. @DaanHoogland, I couldn’t spot the changes for #9949, though.

@DaanHoogland
Copy link
Contributor Author

I will redo this to see if I can do better, if need be there will be some cherry-picking involved...

@DaanHoogland DaanHoogland deleted the 4.20.merge branch December 3, 2024 15:23
weizhouapache added a commit to weizhouapache/cloudstack that referenced this pull request Dec 5, 2024
weizhouapache added a commit to weizhouapache/cloudstack that referenced this pull request Dec 11, 2024
DaanHoogland added a commit that referenced this pull request Dec 20, 2024
* 4.20:
  VR: apply iptables rules when add/remove static routes (#10064)
  Certificate and VM hostname validation improvements (#10051)
  set ulimit for server according to redhat spec (#10040)
  kvm-storage: provide isVMMigrate information to storage plugins (#10093)
  Allow config drive deletion of migrated VM, on host maintenance (#10045)
  linstor: improve heartbeat check with also asking linstor (#10105)
  server: simplify role change validation (#9173)
  UI: create VPC network offering with conserve mode (#10082)
  server: fix typo removeaccessvpn in VirtualRouterElement (#10086)
  UI: remove duplicated Instance Name in Public IP details page (#10087)
  UI: Fixes in the Usage UI (#10000)
  SAML2: add cookie with HttpOnly too #10013 (#10047)
  ui: Allow font-awesome icon usage and optimise icon size inconsistency (#9744)
dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Dec 26, 2024
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.

4 participants