apache / cloudstack

Apache CloudStack is an opensource Infrastructure as a Service (IaaS) cloud computing platform
https://cloudstack.apache.org/
Apache License 2.0
2.1k stars 1.11k forks source link

packaging: support both mysql and mariadb on EL8/EL9 #9941

Open weizhouapache opened 4 days ago

weizhouapache commented 4 days ago

Description

This PR fixes #9742

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

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

weizhouapache commented 4 days ago

@blueorangutan package

codecov[bot] commented 4 days ago

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 15.10%. Comparing base (a2690e9) to head (00875e3).

Additional details and impacted files ```diff @@ Coverage Diff @@ ## 4.19 #9941 +/- ## ============================================ - Coverage 15.10% 15.10% -0.01% + Complexity 11225 11222 -3 ============================================ Files 5404 5404 Lines 473502 473502 Branches 57733 57733 ============================================ - Hits 71543 71533 -10 - Misses 393961 393974 +13 + Partials 7998 7995 -3 ``` | [Flag](https://app.codecov.io/gh/apache/cloudstack/pull/9941/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | Coverage Δ | | |---|---|---| | [uitests](https://app.codecov.io/gh/apache/cloudstack/pull/9941/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | `4.30% <ø> (ø)` | | | [unittests](https://app.codecov.io/gh/apache/cloudstack/pull/9941/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | `15.82% <ø> (-0.01%)` | :arrow_down: | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache#carryforward-flags-in-the-pull-request-comment) to find out more.

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.


🚨 Try these New Features:

blueorangutan commented 4 days ago

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 11578

rohityadavcloud commented 2 days ago

EL7 pkg is deprecated for main, for this is probably just for 4.19.

blueorangutan commented 2 days ago

[SF] Trillian Build Failed (tid-11786)

blueorangutan commented 2 days ago

[SF] Trillian Build Failed (tid-11785)

weizhouapache commented 2 days ago

this seems not working

If mariadb is installed, dnf/yum still ask for mysql installation

[root@rocky9-2 /]# dnf install cloudstack-management 
Last metadata expiration check: 0:21:32 ago on Wed Nov 20 13:37:29 2024.
Error: 
 Problem: problem with installed package mariadb-3:10.5.22-1.el9_2.x86_64
  - package mariadb-3:10.5.22-1.el9_2.x86_64 from @System conflicts with mysql provided by mysql-8.0.36-1.el9_3.x86_64 from appstream
  - package mysql-8.0.36-1.el9_3.x86_64 from appstream conflicts with mariadb provided by mariadb-3:10.5.22-1.el9_2.x86_64 from @System
  - package mysql-8.0.36-1.el9_3.x86_64 from appstream conflicts with mariadb provided by mariadb-3:10.5.22-1.el9_2.x86_64 from appstream
  - package mariadb-3:10.5.22-1.el9_2.x86_64 from appstream conflicts with mysql provided by mysql-8.0.36-1.el9_3.x86_64 from appstream
  - package cloudstack-management-4.19.2.0-shapeblue13402.x86_64 from cloudstack requires mysql, but none of the providers can be installed
  - conflicting requests
(try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages or '--nobest' to use not only best candidate packages)
weizhouapache commented 2 days ago

@blueorangutan package

weizhouapache commented 2 days ago

this should not be in centos7 spec file for 4.19, should it?

yes @DaanHoogland strange, I cherry-pick the commit from another branch where file cloud8/cloud.spec is changed, but on new branch cloud7/cloud.spec is changed

blueorangutan commented 2 days ago

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 11586

weizhouapache commented 2 days ago

tested ok in a rocky9 container

blueorangutan commented 2 days ago

[SF] Trillian Build Failed (tid-11789)

blueorangutan commented 2 days ago

[SF] Trillian Build Failed (tid-11790)

blueorangutan commented 2 days ago

[SF] Trillian Build Failed (tid-11792)

blueorangutan commented 1 day ago

[SF] Trillian test result (tid-11791) Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8 Total time taken: 48246 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr9941-t11791-kvm-ol8.zip Smoke tests completed. 132 look OK, 1 have errors, 0 did not run Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_03_secured_to_nonsecured_vm_migration Error 453.43 test_vm_life_cycle.py