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

Bump Buildah to v1.37.1, c/common v0.60.1, c/image v5.32.1 #23602

Conversation

TomSweeneyRedHat
Copy link
Member

As the title says.

Does this PR introduce a user-facing change?

None

As the title says.

Signed-off-by: tomsweeneyredhat <[email protected]>
@TomSweeneyRedHat TomSweeneyRedHat added the No New Tests Allow PR to proceed without adding regression tests label Aug 13, 2024
Copy link
Contributor

openshift-ci bot commented Aug 13, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: TomSweeneyRedHat

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 13, 2024
github.com/containers/buildah v1.37.0
github.com/containers/common v0.60.1-0.20240806133927-05b2e1fd7cd0
github.com/containers/buildah v1.37.1
github.com/containers/common v0.60.1
Copy link
Member

Choose a reason for hiding this comment

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

This is piratically speaking a downgrade as we were already vendoring c/common from main,
I Still have a open common vendor in #23519 that also shows the you most likely need the test fix from there assuming the "breaking" c/image change was back ported in 5.32.1

Copy link
Member Author

Choose a reason for hiding this comment

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

So next steps? Just back this out and vendor directly into the v5.2 branch?

Copy link
Member

Choose a reason for hiding this comment

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

I would vendor c/common@main here at least.
But without the test fix nothing going to pass so you either cherry-pick that commit or (what I prefer) merge #23519 first and then rebase this.

Copy link
Member

Choose a reason for hiding this comment

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

I would wait for the 5.2 PR at least until all the test fixes are review/merged at least.

Copy link
Member Author

Choose a reason for hiding this comment

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

I've added the test fix for now, off to a meeting, will see add the c/common bump here. I'll talk to @mheon shortly to see if makes sense to cherry-pick this, or just vendor Buildah in the v5.2 branch and add the test fix.

Thanks!

Add a fix to pull to address a zstd:chunked issue as noted in
containers/image#2485

Signed-off-by: tomsweeneyredhat <[email protected]>
@TomSweeneyRedHat TomSweeneyRedHat removed the No New Tests Allow PR to proceed without adding regression tests label Aug 13, 2024
@TomSweeneyRedHat
Copy link
Member Author

I tried reverting c/common to that last version from main, and it backed Buildah out to v1.37.0, which I don't think we want. I've created #23606 to vendor Buildah v1.37.1 directly in Podman v5.2 and I'm going to close this one.

@stale-locking-app stale-locking-app bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Nov 12, 2024
@stale-locking-app stale-locking-app bot locked as resolved and limited conversation to collaborators Nov 12, 2024
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. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note-none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants