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] RPM: ensure config files are patched #2028

Merged
merged 1 commit into from
May 31, 2024

Conversation

lsm5
Copy link
Member

@lsm5 lsm5 commented May 30, 2024

This commit copies over shortnames.conf, registries.conf and storage.conf to the rpm build dir before running the patching script.

Prior to this, the script would complain about not finding those files but the rpmbuild process itself didn't fail.

(cherry picked from commit 06a4eef)

This commit copies over shortnames.conf, registries.conf
and storage.conf to the rpm build dir before running the patching
script.

Prior to this, the script would complain about not finding those files
but the rpmbuild process itself didn't fail.

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
(cherry picked from commit 06a4eef)
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
@lsm5 lsm5 changed the title [skip-ci] RPM: ensure config files are patched [v0.59 backport] [skip-ci] RPM: ensure config files are patched May 30, 2024
@lsm5
Copy link
Member Author

lsm5 commented May 30, 2024

@edsantiago @Luap99 PTAL

Copy link
Member

@edsantiago edsantiago left a comment

Choose a reason for hiding this comment

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

Looks like a clean cherrypick. LGTM, let's get one more set of eyeballs on it.

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

Copy link
Contributor

openshift-ci bot commented May 31, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: edsantiago, lsm5, Luap99

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 00eaaf9 into containers:v0.59 May 31, 2024
10 checks passed
@lsm5 lsm5 deleted the v0.59-rpm-fix branch July 11, 2024 19:45
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