[v0.59 backport] [skip-ci] Packit/RPM: more fixes #2022
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 <[email protected]> (cherry picked from commit 3c96617) Signed-off-by: Lokesh Mandvekar <[email protected]>
|
/approve |
|
[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 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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_namekey when the upstream repo and downstream package name don't match. For this very repo, upstream repo iscommon, while downstream package iscontainers-common. For such cases,downstream_package_nameshould be specified at the package level.The
Source0URL 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
mvcommands in rpm spec have also been replaced bycpso that consecutiverpmbuildruns 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: falsefrom downstream jobs. It's meaningless in those jobs. Even for copr jobs, we should prefer packit's default behavior ofupdate_release: true.(cherry picked from commit 3c96617)
doesn't look like c/common has slash-cherrypick support yet. #2015 (comment) didn't work.