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

[skip-ci] RPM: fix netavark dependency epoch #2071

Merged
merged 1 commit into from
Jun 28, 2024

Conversation

lsm5
Copy link
Member

@lsm5 lsm5 commented Jun 28, 2024

netavark and aardvark-dns dependencies have updated Epoch, we need to handle them correctly in containers-common.

@lsm5 lsm5 marked this pull request as ready for review June 28, 2024 14:09
@lsm5
Copy link
Member Author

lsm5 commented Jun 28, 2024

@jnovy PTAL
cc @Luap99 @mheon

@lsm5
Copy link
Member Author

lsm5 commented Jun 28, 2024

i'll change the netavark_epoch a bit. Hold off on review.

netavark and aardvark-dns dependencies have updated Epoch, we need to
handle them correctly in containers-common.

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
@lsm5
Copy link
Member Author

lsm5 commented Jun 28, 2024

ready for review. PTAL

@jnovy
Copy link
Contributor

jnovy commented Jun 28, 2024

LGTM

@Luap99
Copy link
Member

Luap99 commented Jun 28, 2024

So I assume this means that aardvark-dns, netavark, containers-common must be updated together in the same bohdi to not cause conflicts?

@lsm5
Copy link
Member Author

lsm5 commented Jun 28, 2024

So I assume this means that aardvark-dns, netavark, containers-common must be updated together in the same bohdi to not cause conflicts?

No. containers-common can still go in separately as long as we have the >= dependency for netavark.

We could even remove the min epoch:version-release so that it will fetch the latest available for new installs / system upgrades. Removing the min version can prevent us from enforcing upgrades where required, but it can make things convenient for maintenance. FWIW, the podman package enforces no min-version on containers-common-extra dependency currently.

The netavark dependency before this diff didn't have epoch which worked fine for official Fedora as epoch was 0, but with RHEL conditionals included, this epoch will be needed.

@lsm5
Copy link
Member Author

lsm5 commented Jun 28, 2024

So I assume this means that aardvark-dns, netavark, containers-common must be updated together in the same bohdi to not cause conflicts?

No. containers-common can still go in separately as long as we have the >= dependency for netavark.

err, if we need to enforce min dep on the latest netavark that's yet to land in fedora, then we gotta be careful, maybe release in order (first netavark, then c/common).

@lsm5
Copy link
Member Author

lsm5 commented Jun 28, 2024

Btw, packit people are working on sidetag support which will make bodhi automation with multiple packages easier to handle.

@lsm5
Copy link
Member Author

lsm5 commented Jun 28, 2024

I think handling these dependencies in rpm should be accounted for in the upcoming release process spike.

@jnovy
Copy link
Contributor

jnovy commented Jun 28, 2024

/lgtm
/approve

Copy link
Contributor

openshift-ci bot commented Jun 28, 2024

@jnovy: changing LGTM is restricted to collaborators

In response to this:

/lgtm
/approve

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

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 Jun 28, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jnovy, 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 05d31de into containers:main Jun 28, 2024
12 checks passed
@lsm5 lsm5 deleted the netavark-epoch 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