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

[skip-ci] Packit/RPM: more fixes #2015

Merged
merged 1 commit into from
May 28, 2024

Conversation

lsm5
Copy link
Member

@lsm5 lsm5 commented May 23, 2024

Packit failed to trigger an automatic fedora package update on the upstream release v0.59.0 which brought to light further issues which this commit corrects.

Packit doesn't honor a global downstream_package_name key when the upstream repo and downstream package name don't match. For this very repo, upstream repo is common, while downstream package is containers-common. For such cases, downstream_package_name should be specified at the package level.

The Source0 URL in rpm spec has also been corrected. This wasn't noticed in packit jobs on PRs because packit replaces Source0 with a locally created archive.

The mv commands in rpm spec have also been replaced by cp so that consecutive rpmbuild runs will not complain about not finding the source files.

The autosetup step in rpm spec has also been updated to the correct untarred archive name format.

@lsm5
Copy link
Member Author

lsm5 commented May 23, 2024

The downstream_package_name key should ideally work at the global level as it does for podman and other repos. packit upstream is tracking it at packit/packit#2320

@lsm5 lsm5 marked this pull request as draft May 23, 2024 14:26
@lsm5 lsm5 force-pushed the packit-package-name-fix branch from 9144bc1 to 332a7de Compare May 23, 2024 18:06
@lsm5 lsm5 changed the title [skip-ci] Packit: downstream package name at package level [skip-ci] Packit/RPM: more fixes May 23, 2024
@lsm5 lsm5 force-pushed the packit-package-name-fix branch 3 times, most recently from 689910c to a623b64 Compare May 23, 2024 18:38
@lsm5 lsm5 marked this pull request as ready for review May 23, 2024 19:14
@lsm5 lsm5 force-pushed the packit-package-name-fix branch from a623b64 to c3b98a8 Compare May 23, 2024 19:17
@lsm5
Copy link
Member Author

lsm5 commented May 27, 2024

@Luap99 @edsantiago @rhatdan @TomSweeneyRedHat @mheon PTAL.

I have updated the containers-common rpm manually to the latest version.

@Luap99
Copy link
Member

Luap99 commented May 27, 2024

You can rebase to pick up the spelling fix: #2019

Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

LGTM, I cannot claim I understand the spec files but your commit message explanation sounds good enough to me

Packit failed to trigger an automatic fedora package update on the
upstream release v0.59.0 which brought to light further issues which
this commit corrects.

Packit doesn't honor a global `downstream_package_name` key when the
upstream repo and downstream package name don't match. For this very
repo, upstream repo is `common`, while downstream package is
`containers-common`. For such cases, `downstream_package_name`
should be specified at the package level.

The `Source0` URL in rpm spec has also been corrected. This wasn't noticed
in packit jobs on PRs because packit replaces Source0 with a locally
created archive.

The `mv` commands in rpm spec have also been replaced by `cp` so that
consecutive `rpmbuild` runs will not complain about not finding the
source files.

The autosetup step in rpm spec has also been updated to the correct
untarred archive name format.

Misc cleanup includes removal of `update_release: false` from downstream
jobs. It's meaningless in those jobs. Even for copr jobs, we should
prefer packit's default behavior of `update_release: true`.

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
@lsm5 lsm5 force-pushed the packit-package-name-fix branch from fc19a57 to 3c96617 Compare May 27, 2024 13:31
@rhatdan
Copy link
Member

rhatdan commented May 28, 2024

/approve
/lgtm

Copy link
Contributor

openshift-ci bot commented May 28, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lsm5, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit e441b4c into containers:main May 28, 2024
12 checks passed
@lsm5 lsm5 deleted the packit-package-name-fix branch May 28, 2024 16:33
@lsm5
Copy link
Member Author

lsm5 commented May 28, 2024

/cherrypick v0.59

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.

3 participants