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

COPR: fix dependencies #13105

Merged
merged 1 commit into from
Feb 1, 2022

Conversation

lsm5
Copy link
Member

@lsm5 lsm5 commented Feb 1, 2022

containers-common rpm now Recommends: netavark and
Provides: container-network-stack which are
actually provided by both cni-plugins and netavark.

Netavark has a Recommends: aardvark-dns already.

So, we should only depend on the containers-common package and let it
handle everything.

Also, dnsname no longer needs to be recommended if we want new users to
use netavark / aardvark-dns.

[NO NEW TESTS NEEDED]

Signed-off-by: Lokesh Mandvekar [email protected]

@cevich @rhatdan @mheon @baude @edsantiago PTAL

/cc @containers/podman-maintainers

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 1, 2022
containers-common rpm now `Recommends: netavark` and
`Provides: container-network-stack` which are
actually provided by both cni-plugins and netavark.

Netavark has a `Recommends: aardvark-dns` already.

So, we should only depend on the containers-common package and let it
handle everything.

Also, dnsname no longer needs to be recommended if we want new users to
use netavark / aardvark-dns.

[NO NEW TESTS NEEDED]

Signed-off-by: Lokesh Mandvekar <[email protected]>
@lsm5 lsm5 force-pushed the copr-fix-dependencies branch from 22109f0 to cd8b302 Compare February 1, 2022 19:22
@cevich
Copy link
Member

cevich commented Feb 1, 2022

LGTM

@rhatdan
Copy link
Member

rhatdan commented Feb 1, 2022

/approve
/lgtm
/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 1, 2022
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 1, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 1, 2022

[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

# containers-common pulled from podman-next copr for f34,
# from the distro repos for f35+
%if 0%{?fedora} <= 35
Requires: containers-common >= 4:1-39
Copy link
Member

Choose a reason for hiding this comment

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

The last bodhi I see for fc35 is -36 and it's not even in repos yet; for fc34 it's -21. Won't this make the package uninstallable?

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 RE: f34, I sent a containers-common to the podman-next copr. https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/build/3289552/ . Also, for f35, there's -39 at https://bodhi.fedoraproject.org/updates/FEDORA-2022-0afb41b09c which got struck down. But it should still work ok with non-moby users.

@rhatdan
Copy link
Member

rhatdan commented Feb 1, 2022

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 1, 2022
@openshift-merge-robot openshift-merge-robot merged commit 6f491e2 into containers:main Feb 1, 2022
@lsm5 lsm5 deleted the copr-fix-dependencies branch February 28, 2022 15:06
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 21, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 21, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants