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

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

Draft
wants to merge 1 commit into
base: 4.19
Choose a base branch
from

Conversation

weizhouapache
Copy link
Member

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
Copy link
Member Author

@blueorangutan package

Copy link

codecov bot commented Nov 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

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

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.


🚨 Try these New Features:

@blueorangutan
Copy link

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

Copy link
Contributor

@DaanHoogland DaanHoogland left a comment

Choose a reason for hiding this comment

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

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

@rohityadavcloud rohityadavcloud added this to the 4.19.2 milestone Nov 20, 2024
@rohityadavcloud
Copy link
Member

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

@blueorangutan
Copy link

[SF] Trillian Build Failed (tid-11786)

@blueorangutan
Copy link

[SF] Trillian Build Failed (tid-11785)

@weizhouapache
Copy link
Member Author

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
Copy link
Member Author

@blueorangutan package

@weizhouapache
Copy link
Member Author

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
Copy link

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

@weizhouapache
Copy link
Member Author

tested ok in a rocky9 container

@blueorangutan
Copy link

[SF] Trillian Build Failed (tid-11789)

@blueorangutan
Copy link

[SF] Trillian Build Failed (tid-11790)

@blueorangutan
Copy link

[SF] Trillian Build Failed (tid-11792)

@blueorangutan
Copy link

[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

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