Skip to content

Packaging: accept normalized Marvin archive names - #13793

Draft
Dogface2k wants to merge 1 commit into
apache:mainfrom
Dogface2k:agent/packaging-normalized-marvin-archive
Draft

Packaging: accept normalized Marvin archive names#13793
Dogface2k wants to merge 1 commit into
apache:mainfrom
Dogface2k:agent/packaging-normalized-marvin-archive

Conversation

@Dogface2k

@Dogface2kDogface2k commented Aug 4, 2026

Copy link
Copy Markdown

Summary

Setuptools 69.3.0 introduced PEP 625-compliant normalization of
source-distribution filenames.

Although the Python project is declared as name="Marvin", current
Setuptools versions produce:

marvin-<version>.tar.gz

Older versions may still produce:

Marvin-<version>.tar.gz

Update the Debian packaging consumers to match [Mm]arvin-*.tar.gz,
allowing both forms to remain supported.

This only changes archive discovery during packaging and installation.
It does not alter the Marvin archive contents or CloudStack runtime
behaviour.

still need review
packaging/el8/cloud.spec
packaging/suse15/cloud.spec
tools/marvin/pom.xml

will tighten patterns

@DaanHooglandDaanHoogland left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

clgtm

@codecov

codecovBot commented Aug 5, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 19.65%. Comparing base (4f11707) to head (f1f6350).

Additional details and impacted files
@@ Coverage Diff @@## main #13793 +/- ##
=========================================
Coverage 19.65% 19.65% + Complexity 19792 19790 -2 
=========================================
Files 6368 6368 Lines 574881 574881 Branches 70351 70351 =========================================
+ Hits 112970 112974 +4 + Misses 449639 449635 -4 
Partials 12272 12272 
FlagCoverage Δ
uitests3.41% <ø> (ø)
unittests20.92% <ø> (+<0.01%)⬆️

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.

🚀 New features to boost your workflow:
  • ❄️ 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.

@weizhouapacheweizhouapache left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

code lgtm

it is consistent with @DaanHoogland 's PR: #11873

@weizhouapache

Copy link
Copy Markdown
Member

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@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.

@blueorangutan

Copy link
Copy Markdown

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

@DaanHoogland

Copy link
Copy Markdown
Contributor

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

@blueorangutan test u26 kvm-u26

@blueorangutan

Copy link
Copy Markdown

@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

@DaanHoogland

Copy link
Copy Markdown
Contributor

@blueorangutan test ubuntu24 kvm-ubuntu26

@blueorangutan

Copy link
Copy Markdown

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

@weizhouapache

Copy link
Copy Markdown
Member

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

image

Sign up for freeto 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

@Dogface2k@weizhouapache@blueorangutan@DaanHoogland