packaging: support both mysql and mariadb on EL8/EL9

[weizhouapache]

Description

This PR fixes #9742

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?

[weizhouapache]

@blueorangutan package

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 15.10%. Comparing base (a2690e9) to head (00875e3).
Report is 65 commits behind head on 4.19.

Additional details and impacted files

@@             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	Coverage Δ
uitests	4.30% <ø> (ø)
unittests	15.82% <ø> (-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.

[blueorangutan]

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

[DaanHoogland]

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

[rohityadavcloud]

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

[blueorangutan]

[SF] Trillian Build Failed (tid-11786)

[blueorangutan]

[SF] Trillian Build Failed (tid-11785)

[weizhouapache]

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]

@blueorangutan package

[weizhouapache]

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]

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

[weizhouapache]

tested ok in a rocky9 container

[blueorangutan]

[SF] Trillian Build Failed (tid-11789)

[blueorangutan]

[SF] Trillian Build Failed (tid-11790)

[blueorangutan]

[SF] Trillian Build Failed (tid-11792)

[blueorangutan]

[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

[blueorangutan]

[SF] Trillian Build Failed (tid-11800)

[blueorangutan]

[SF] Trillian Build Failed (tid-11805)

[blueorangutan]

[SF] Trillian Build Failed (tid-11804)

[blueorangutan]

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

Test	Result	Time (s)	Test File

[blueorangutan]

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

Test	Result	Time (s)	Test File

[sureshanaparti]

clgtm

[DaanHoogland]

@sureshanaparti how will we test this, if at all? cc @weizhouapache

Is the reporter prepared to test for instance?

[blueorangutan]

[SF] Trillian Build Failed (tid-12231)

[blueorangutan]

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

Test	Result	Time (s)	Test File

[DaanHoogland]

tested in the lab creating envs with either mariadb or mysql

[artem-sidorenko]

@DaanHoogland @weizhouapache this fix is available only in 4.19, is it going to be ported to 4.20 as a current LTS release? (In our test environment we can either install 4.19 with current mariadb or 4.20 with old mysql)

[weizhouapache]

@DaanHoogland @weizhouapache this fix is available only in 4.19, is it going to be ported to 4.20 as a current LTS release? (In our test environment we can either install 4.19 with current mariadb or 4.20 with old mysql)

@artem-sidorenko
normally, all commits in 4.19 are merged into 4.20 and onwards
so, this change is in 4.20 and main as well

[DaanHoogland]

it is on main and 4.20m, so it will be in 4.20.1 and 21

[artem-sidorenko]

Many thanks!