Skip to content

fix(ci): harden packit rpm source prep#1182

Merged
maxamillion merged 3 commits intomainfrom
dn/rpm-ci-fix
May 6, 2026
Merged

fix(ci): harden packit rpm source prep#1182
maxamillion merged 3 commits intomainfrom
dn/rpm-ci-fix

Conversation

@drew
Copy link
Copy Markdown
Collaborator

@drew drew commented May 6, 2026

Summary

Fix the RPM Packit source-prep and artifact paths. The RPM package jobs now tolerate slow Cargo registry responses, avoid dev/vm-dev tags as package versions, return the correct Source0 archive path to Packit, and collect Packit local RPM outputs from the architecture-specific output directory.

Related Issue

Fixes failing Release Dev RPM job: https://github.com/NVIDIA/OpenShell/actions/runs/25406306514/job/74518129270

Changes

  • Add Cargo HTTP timeout and retry settings to the Packit vendoring step.
  • Run cargo vendor --locked so CI uses the committed lockfile.
  • Return only the Source0 tarball from Packit create-archive; Source1 remains patched explicitly in fix-spec-file.
  • Restrict Packit version discovery to SemVer release tags so operational tags like vm-dev do not become invalid Cargo versions.
  • Collect local Packit RPM artifacts from $PWD/${arch} as well as legacy ~/rpmbuild/RPMS, and fail with a clear error when no RPMs are copied.

Testing

  • Rebased onto origin/main at f17806ca, which contains the shared mise.lock fix.
  • Confirmed mise.lock has no PR diff.
  • Confirmed .github/workflows/release-canary.yml has no PR diff.
  • mise run pre-commit passes.
  • YAML parse checks for .packit.yaml and .github/workflows/rpm-package.yml.
  • git diff --check.
  • Release Dev workflow succeeded on this branch before the final rebase: https://github.com/NVIDIA/OpenShell/actions/runs/25416029359
  • Reproduced and fixed Packit dev-tag version failure (m.dev Cargo version).
  • Reproduced and fixed Packit local artifact collection path failure.

Checklist

  • Follows Conventional Commits.
  • Commits are signed off (DCO).
  • Architecture docs updated: not applicable; CI packaging config only.

@drew drew requested review from a team, derekwaynecarr, maxamillion and mrunalp as code owners May 6, 2026 00:06
drew added 3 commits May 5, 2026 23:10
Signed-off-by: Drew Newberry <anewberry@nvidia.com>
Signed-off-by: Drew Newberry <anewberry@nvidia.com>
Signed-off-by: Drew Newberry <anewberry@nvidia.com>
@drew drew force-pushed the dn/rpm-ci-fix branch from ea172d9 to 6c20649 Compare May 6, 2026 06:13
Copy link
Copy Markdown
Collaborator

@maxamillion maxamillion left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@maxamillion maxamillion merged commit 6ce988d into main May 6, 2026
22 checks passed
@maxamillion maxamillion deleted the dn/rpm-ci-fix branch May 6, 2026 13:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants