packaging: align mysql connector with Marvin - #13840
Conversation
|
@blueorangutan package |
|
@andrijapanicsb a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress. |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## 4.22 #13840 +/- ##
============================================
- Coverage 17.69% 17.69% -0.01%
+ Complexity 15835 15834 -1
============================================
Files 5925 5925
Lines 533539 533539
Branches 65274 65274
============================================
- Hits 94427 94421 -6
- Misses 428435 428442 +7
+ Partials 10677 10676 -1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
|
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 18814 |
|
@blueorangutan test ol10 kvm-ol10 |
|
@blueorangutan test debian12 kvm-debian12 |
|
@DaanHoogland a [SL] Trillian-Jenkins test job (debian12 mgmt + kvm-debian12) has been kicked to run smoke tests |
|
. |
|
@ACSHomeBot package kvm el |
|
@ACSHomeBot package el |
Packaging results (commit f082734)
Test packages are available at: |
|
[SF] Trillian test result (tid-16727)
|
|
@blueorangutan test ol10 kvm-ol10 |
|
@DaanHoogland a [SL] Trillian-Jenkins test job (ol10 mgmt + kvm-ol10) has been kicked to run smoke tests |
There was a problem hiding this comment.
Pull request overview
This PR updates the EL8 and SUSE15 RPM specs to align the bundled/installed mysql-connector-python versioning with Marvin’s >= 8.4.0 requirement, fixing packaging-driven connector/Python mismatches seen in smoke tests on newer distros.
Changes:
- Update the bundled management wheel from
mysql-connector-python8.3.0 to 8.4.0. - Correct the Python version gate for installing the newer connector from
>= 3.7to>= 3.8. - Update the Marvin
%postconnector install to use 8.4.0 instead of 8.0.31.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 6 comments.
| File | Description |
|---|---|
| packaging/suse15/cloud.spec | Bumps bundled connector wheel to 8.4.0, adjusts Python version check to 3.8+, and updates Marvin %post to install 8.4.0. |
| packaging/el8/cloud.spec | Same connector wheel/version-check/Marvin %post alignment as SUSE15 spec. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
| # Package mysql-connector-python (bundled to avoid dependency on external community repo) | ||
| # Version 8.0.31 is the last version supporting Python 3.6 (EL8) | ||
| wget -P ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup/wheel https://files.pythonhosted.org/packages/08/1f/42d74bae9dd6dcfec67c9ed0f3fa482b1ae5ac5f117ca82ab589ecb3ca19/mysql_connector_python-8.0.31-py2.py3-none-any.whl | ||
| # Version 8.3.0 supports Python 3.8 to 3.12 (EL9, EL10) | ||
| wget -P ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup/wheel https://files.pythonhosted.org/packages/53/ed/26a4b8cacb8852c6fd97d2d58a7f2591c41989807ea82bd8d9725a4e6937/mysql_connector_python-8.3.0-py2.py3-none-any.whl | ||
| # Version 8.4.0 supports Python 3.8 to 3.12 (EL9, EL10) | ||
| wget -P ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup/wheel https://files.pythonhosted.org/packages/d3/fb/c28d1cd952da61f8f27173ce5172f89a65d55b430961a0104b7b294a9bfa/mysql_connector_python-8.4.0-py2.py3-none-any.whl |
| if python3 -c 'import sys; sys.exit(0 if sys.version_info >= (3, 8) else 1)'; then | ||
| pip3 install %{_datadir}/%{name}-management/setup/wheel/mysql_connector_python-8.4.0-py2.py3-none-any.whl | ||
| else | ||
| pip3 install %{_datadir}/%{name}-management/setup/wheel/mysql_connector_python-8.0.31-py2.py3-none-any.whl | ||
| fi |
| %post marvin | ||
| pip3 install --upgrade https://files.pythonhosted.org/packages/08/1f/42d74bae9dd6dcfec67c9ed0f3fa482b1ae5ac5f117ca82ab589ecb3ca19/mysql_connector_python-8.0.31-py2.py3-none-any.whl | ||
| pip3 install --upgrade https://files.pythonhosted.org/packages/d3/fb/c28d1cd952da61f8f27173ce5172f89a65d55b430961a0104b7b294a9bfa/mysql_connector_python-8.4.0-py2.py3-none-any.whl | ||
| pip3 install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz |
| # Package mysql-connector-python (bundled to avoid dependency on external community repo) | ||
| # Version 8.0.31 is the last version supporting Python 3.6 (EL8) | ||
| wget -P ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup/wheel https://files.pythonhosted.org/packages/08/1f/42d74bae9dd6dcfec67c9ed0f3fa482b1ae5ac5f117ca82ab589ecb3ca19/mysql_connector_python-8.0.31-py2.py3-none-any.whl | ||
| # Version 8.3.0 supports Python 3.8 to 3.12 (EL9, EL10) | ||
| wget -P ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup/wheel https://files.pythonhosted.org/packages/53/ed/26a4b8cacb8852c6fd97d2d58a7f2591c41989807ea82bd8d9725a4e6937/mysql_connector_python-8.3.0-py2.py3-none-any.whl | ||
| # Version 8.4.0 supports Python 3.8 to 3.12 (EL9, EL10) | ||
| wget -P ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup/wheel https://files.pythonhosted.org/packages/d3/fb/c28d1cd952da61f8f27173ce5172f89a65d55b430961a0104b7b294a9bfa/mysql_connector_python-8.4.0-py2.py3-none-any.whl |
| if python3 -c 'import sys; sys.exit(0 if sys.version_info >= (3, 8) else 1)'; then | ||
| pip3 install %{_datadir}/%{name}-management/setup/wheel/mysql_connector_python-8.4.0-py2.py3-none-any.whl | ||
| else | ||
| pip3 install %{_datadir}/%{name}-management/setup/wheel/mysql_connector_python-8.0.31-py2.py3-none-any.whl | ||
| fi |
| %post marvin | ||
| pip3 install --upgrade https://files.pythonhosted.org/packages/08/1f/42d74bae9dd6dcfec67c9ed0f3fa482b1ae5ac5f117ca82ab589ecb3ca19/mysql_connector_python-8.0.31-py2.py3-none-any.whl | ||
| pip3 install --upgrade https://files.pythonhosted.org/packages/d3/fb/c28d1cd952da61f8f27173ce5172f89a65d55b430961a0104b7b294a9bfa/mysql_connector_python-8.4.0-py2.py3-none-any.whl | ||
| pip3 install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz |
Description
This is a small follow-up for #13482.
In #13482 the Marvin dependency was changed to
mysql-connector-python >= 8.4.0. The older 8.0.31 connector was installed on the Marvin node and caused smoke test failures when testing against OL10, Debian 12 and SUSE15 management environments.However, the RPM specs were not updated at the same time. Current situation is:
%poststill explicitly installs 8.0.31 before it installs Marvin, while Marvin asks for 8.4.0 or newer;Management and Marvin are normally installed on different machines, so this is not a clash between two packages on the same server. Still, each RPM package should install a connector version which matches the component inside that package.
This PR changes both EL and SUSE RPM specs:
%postinstalls exact 8.4.0 before installing Marvin.I checked the current 4.23 RC branches and
main, and the same old blocks are still present there. This PR targets4.22, so it can be merged forward after that.Types of changes
Feature/Enhancement Scale or Bug Severity
Feature/Enhancement Scale
Bug Severity
How Has This Been Tested?
Tests done locally:
rpmspec -Pon Oracle Linux 8.10;pip check;Requires-Python: >=3.8metadata was verified, with cleanpip check;The upstream multi-distribution package build was also requested on this PR.