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

[v0.59 backport] [skip-ci] Packit/RPM: more fixes #2022

Merged
merged 1 commit into from
May 28, 2024

Conversation

lsm5
Copy link
Member

@lsm5 lsm5 commented May 28, 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.

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.

(cherry picked from commit 3c96617)

doesn't look like c/common has slash-cherrypick support yet. #2015 (comment) didn't work.

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>
(cherry picked from commit 3c96617)
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
@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 fd7af9f into containers:v0.59 May 28, 2024
10 checks passed
@lsm5 lsm5 deleted the v0.59-packit-backport branch July 11, 2024 19:44
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.

2 participants