Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 19.78%. Comparing base (4f11707) to head (1127798).
⚠️ Report is 152 commits behind head on main.

@@             Coverage Diff              @@
##               main   #13793      +/-   ##
============================================
+ Coverage     19.65%   19.78%   +0.13%     
- Complexity    19792    19993     +201     
============================================
  Files          6368     6371       +3     
  Lines        574881   575909    +1028     
  Branches      70351    70509     +158     
============================================
+ Hits         112970   113929     +959     
+ Misses       449639   449549      -90     
- Partials      12272    12431     +159     

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@blueorangutan package

@weizhouapache a [SL] Jenkins job has been kicked to build packages. It will be bundled with no SystemVM templates. I'll keep you posted as I make progress.

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

the marvin box the smoke tests use is el, but marvin is also installed on the MSs, so

@blueorangutan test u26 kvm-u26

@DaanHoogland [SL] unsupported parameters provided. Supported mgmt server os are: suse15, alma10, ol10, rocky10, alma9, centos7, centos6, rocky9, alma8, ubuntu18, ol9, ol8, ubuntu22, debian12, ubuntu20, ubuntu26, rocky8, ubuntu24. Supported hypervisors are: kvm-centos6, kvm-centos7, kvm-rocky8, kvm-rocky9, kvm-rocky10, kvm-ol8, kvm-ol9, kvm-ol10, kvm-alma8, kvm-alma9, kvm-alma10, kvm-ubuntu18, kvm-ubuntu20, kvm-ubuntu22, kvm-ubuntu24, kvm-ubuntu26, kvm-debian12, kvm-suse15, vmware-55u3, vmware-60u2, vmware-65u2, vmware-67u3, vmware-70u1, vmware-70u2, vmware-70u3, vmware-80, vmware-80u1, vmware-80u2, vmware-80u3, vmware-80u3e, xenserver-65sp1, xenserver-71, xenserver-74, xenserver-84, xcpng74, xcpng76, xcpng80, xcpng81, xcpng82, xcpng83

@blueorangutan test ubuntu24 kvm-ubuntu26

@DaanHoogland a [SL] Trillian-Jenkins test job (ubuntu24 mgmt + kvm-ubuntu26) has been kicked to run smoke tests

the marvin box the smoke tests use is el, but marvin is also installed on the MSs, so

also, the ubuntu container to build debian/ubuntu packages are old, it still wrote to Marvin-xxxx.tgz

[SF] Trillian test result (tid-24)
Environment: kvm-ubuntu26 (x2), zone: Advanced Networking with Mgmt server u24
Total time taken: 57557 seconds
Marvin logs: [archive removed]
Smoke tests completed. 156 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

reviewing

@Dogface2k Can we add the same change to packaging/el8/cloud.spec and packaging/suse15/cloud.spec in this PR?

@Dogface2k can this be merged or is some work pending?

@Dogface2k can this be merged or is some work pending?

@abh1sar
the docker containers we are using for packaging jobs are very old. They still generate Marvin-*.tgz

the code lgtm
it would be good if someone build packages manually in recent OSes (I think marvin-.tgz will be created), and test the installation of cloudstack-marvin (in debian/ubuntu and rhel/suse containers), currently we use ol9 as marvin node in testing.

@Dogface2k can this be merged or is some work pending?

@abh1sar the docker containers we are using for packaging jobs are very old. They still generate Marvin-*.tgz

the code lgtm it would be good if someone build packages manually in recent OSes (I think marvin-.tgz will be created), and test the installation of cloudstack-marvin (in debian/ubuntu and rhel/suse containers), currently we use ol9 as marvin node in testing.

This can be merged if there is anything else please let me know.

@Dogface2k can this be merged or is some work pending?

@abh1sar the docker containers we are using for packaging jobs are very old. They still generate Marvin-*.tgz
the code lgtm it would be good if someone build packages manually in recent OSes (I think marvin-.tgz will be created), and test the installation of cloudstack-marvin (in debian/ubuntu and rhel/suse containers), currently we use ol9 as marvin node in testing.

This can be merged if there is anything else please let me know.

@Dogface2k
have you tested the packaging with any OSes ?

@Dogface2k can this be merged or is some work pending?

@abh1sar the docker containers we are using for packaging jobs are very old. They still generate Marvin-*.tgz
the code lgtm it would be good if someone build packages manually in recent OSes (I think marvin-.tgz will be created), and test the installation of cloudstack-marvin (in debian/ubuntu and rhel/suse containers), currently we use ol9 as marvin node in testing.

This can be merged if there is anything else please let me know.

@Dogface2k have you tested the packaging with any OSes ?

I have not tested assuming someone will. I left in draft for me to test later today or tomorrow.

@Dogface2k can this be merged or is some work pending?

@abh1sar the docker containers we are using for packaging jobs are very old. They still generate Marvin-*.tgz
the code lgtm it would be good if someone build packages manually in recent OSes (I think marvin-.tgz will be created), and test the installation of cloudstack-marvin (in debian/ubuntu and rhel/suse containers), currently we use ol9 as marvin node in testing.

This can be merged if there is anything else please let me know.

@Dogface2k have you tested the packaging with any OSes ?

Got some tests queued now!

@Dogface2k @abh1sar I have tested this on Debian 13 (setuptools 78.1.1, Python 3.13), with the change applied to the 4.22 branch.

Without this PR, dpkg-buildpackage stops at cp tools/marvin/dist/Marvin-*.tar.gz because setuptools writes marvin-4.22.2.0.tar.gz.

With this PR the build completes and cloudstack-marvin contains /usr/share/cloudstack-marvin/marvin-4.22.2.0.tar.gz. The postinst glob picks it up: pip install --upgrade /usr/share/cloudstack-marvin/[Mm]arvin-*.tar.gz processes the file and builds Marvin.

Two things I saw while installing the package on Debian 13. They are not caused by this PR:

• The first postinst line, python3 -m pip install --upgrade pip, fails with externally-managed-environment (PEP 668). With PIP_BREAK_SYSTEM_PACKAGES=1 it still fails because pip cannot uninstall the Debian pip (uninstall-no-record-file). Debian 12 behaves the same way.
• On 4.22, the PyCrypt dependency does not build on Python 3.13. main already uses pycryptodome (marvin: use pycryptodome instead of PyCrypt #13594).

LGTM for the file name change

@Dogface2k @abh1sar I have tested this on Debian 13 (setuptools 78.1.1, Python 3.13), with the change applied to the 4.22 branch.

Without this PR, dpkg-buildpackage stops at cp tools/marvin/dist/Marvin-*.tar.gz because setuptools writes marvin-4.22.2.0.tar.gz.

With this PR the build completes and cloudstack-marvin contains /usr/share/cloudstack-marvin/marvin-4.22.2.0.tar.gz. The postinst glob picks it up: pip install --upgrade /usr/share/cloudstack-marvin/[Mm]arvin-*.tar.gz processes the file and builds Marvin.

Two things I saw while installing the package on Debian 13. They are not caused by this PR:

• The first postinst line, python3 -m pip install --upgrade pip, fails with externally-managed-environment (PEP 668). With PIP_BREAK_SYSTEM_PACKAGES=1 it still fails because pip cannot uninstall the Debian pip (uninstall-no-record-file). Debian 12 behaves the same way.
• On 4.22, the PyCrypt dependency does not build on Python 3.13. main already uses pycryptodome (marvin: use pycryptodome instead of PyCrypt #13594).

LGTM for the file name change

great, thanks for the testing

merging based on approvals and manual testing.

I will cherry pick the commit for #13594 to 4.22 branch.

I will cherry pick the commit for #13594 to 4.22 branch.

done , commit 2e450cb