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

rpm: correctly obsolete older rpm builds #271

Merged

Conversation

lsm5
Copy link
Member

@lsm5 lsm5 commented Sep 13, 2023

The prior change in #268 didn't completely obsolete older builds of gvisor-tap-vsock, causing installation conflicts with the official Fedora builds. This commit should correctly obsolete fedora packages.

Ref: https://cirrus-ci.com/task/5730166412935168

This change should also address installation conflicts in
cockpit-reverse dependency tests on podman upstream

Ref: https://artifacts.dev.testing-farm.io/716a3cac-ab80-4eb8-921c-da3a784b94fb/

@baude @Luap99 @edsantiago PTAL. I added the 2 latest commits from https://src.fedoraproject.org/rpms/gvisor-tap-vsock/commits/rawhide to this PR. In case you wanna manually try, you can install the latest build from https://koji.fedoraproject.org/koji/packageinfo?packageID=37521 over the gvisor already in Fedora.

@@ -70,6 +70,10 @@ dynamic port forwarding.
%package gvforwarder
Summary: %{desc_gvforwarder}
Provides: gvforwarder = %{epoch}:%{version}-%{release}
%if !%{defined copr_username}
Obsoletes: %{name} < 6:0.7.0-6
Copy link
Member

Choose a reason for hiding this comment

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

I haven't confirmed the -6 but otherwise LGTM. Thank you.

Copy link
Member Author

Choose a reason for hiding this comment

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

@edsantiago the latest build in bodhi is -6 so this should obsolete anything less than that.

@lsm5 lsm5 marked this pull request as ready for review September 13, 2023 18:20
@lsm5
Copy link
Member Author

lsm5 commented Sep 14, 2023

@baude @Luap99 PTAL. let's get this in as well.

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

@lsm5
Copy link
Member Author

lsm5 commented Sep 14, 2023

@Luap99 thanks, needs an approved label too

@Luap99
Copy link
Member

Luap99 commented Sep 14, 2023

I don't have the openshift permissions on this repo: https://github.com/containers/gvisor-tap-vsock/blob/main/OWNERS

We can cheat by manually setting the label via github UI but I rather leave this up for actual maintainer of this repo.

@lsm5
Copy link
Member Author

lsm5 commented Sep 14, 2023

@Luap99 thanks.

@cfergeau @baude PTAL

@lsm5 lsm5 marked this pull request as draft September 14, 2023 14:26
@lsm5
Copy link
Member Author

lsm5 commented Sep 14, 2023

Sorry about the earlier nags. Converting to draft as this fix doesn't yet address the conflicts noticed in cockpit reverse dependency tests in containers/podman#19953

@openshift-ci openshift-ci bot removed the lgtm label Sep 14, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 14, 2023

New changes are detected. LGTM label has been removed.

The prior change in containers#268 didn't completely obsolete older builds of
gvisor-tap-vsock, causing installation conflicts with the official
Fedora builds. This commit should correctly obsolete fedora packages.

Ref: https://cirrus-ci.com/task/5730166412935168

This change should also address installation conflicts in
cockpit-reverse dependency tests on podman upstream

Ref: https://artifacts.dev.testing-farm.io/716a3cac-ab80-4eb8-921c-da3a784b94fb/

Signed-off-by: Lokesh Mandvekar <[email protected]>
@lsm5 lsm5 force-pushed the gvforwarder-subpackage-followup branch from 970d1a1 to f82824a Compare September 14, 2023 14:46
@lsm5 lsm5 marked this pull request as ready for review September 14, 2023 15:29
@lsm5
Copy link
Member Author

lsm5 commented Sep 14, 2023

@baude PTAL

@lsm5
Copy link
Member Author

lsm5 commented Sep 14, 2023

i'm gonna add the labels and merge it. This doesn't affect upstream and we need this to unblock revdep tests for cockpit.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 14, 2023

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: 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-robot openshift-merge-robot merged commit 9ebd937 into containers:main Sep 14, 2023
15 checks passed
@lsm5 lsm5 deleted the gvforwarder-subpackage-followup branch September 14, 2023 18:25
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.

4 participants