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

[v5.3] Bump to Buildah v1.38.0 #24528

Merged

Conversation

TomSweeneyRedHat
Copy link
Member

Bump to Buildah v1.38.0 in preparation of Podman v5.3.

This will also ensure the following versions are in place:

c/storage: v1.56.0
c/image: v5.33.0
c/common: v0.61.0

Does this PR introduce a user-facing change?

None

@TomSweeneyRedHat TomSweeneyRedHat added the No New Tests Allow PR to proceed without adding regression tests label Nov 11, 2024
@openshift-ci openshift-ci bot added release-note-none approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 11, 2024
@TomSweeneyRedHat
Copy link
Member Author

Crossing my fingers on this. The make died in the docs directory in my sandbox, but I think it's an issue in my troff settings in my newly updated VM.

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

@edsantiago
Copy link
Member

Culprit seems to be containers/common#2174

@Luap99
Copy link
Member

Luap99 commented Nov 11, 2024

Oh I missed that we have such a test here.

It("podman run with FIPS mode secrets", func() {

It is clearly not sane to create such a import file in a e2e tests without user consent. And more importantly it will affected all parallel running tests. Given the new logic requires the kernel to be booted in the right mode (I think?!) we have no way of chaining this thus I recommend nuking the test or skip it always for now

@Luap99
Copy link
Member

Luap99 commented Nov 11, 2024

Also you need to pick #24526 as Ed mentioned during standup.

* treadmill script: handle an obscure corner case
  wherein the script would bail because it thought
  there were no buildah-vendor changes.

* two new test skips

* update the diffs; line-number changes due to buildah
  PRs touching helpers.bash

Signed-off-by: Ed Santiago <[email protected]>
(cherry picked from commit 33398eb)
Signed-off-by: tomsweeneyredhat <[email protected]>
@TomSweeneyRedHat
Copy link
Member Author

Thanks @Luap99 , I've cherry-picked @edsantiago 's commit, and repushed. Fingers double crossed now.

@Luap99
Copy link
Member

Luap99 commented Nov 11, 2024

Without removing/skipping the FPIS int test this will not pass, #24528 (comment)

@TomSweeneyRedHat
Copy link
Member Author

Missed the FIPS bit @Luap99 , I assumed (oh, oh), that was part of the cherry-pick that you pointed at. WIll touch that up too.

The FIPS mode secrets test cannot run on this branch,
skip them for now.

Signed-off-by: tomsweeneyredhat <[email protected]>
Bump to Buildah v1.38.0 in preparation of Podman v5.3.

This will also ensure the following versions are in place:

c/storage: v1.56.0
c/image:   v5.33.0
c/common:  v0.61.0

Signed-off-by: tomsweeneyredhat <[email protected]>
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 Nov 11, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Luap99, 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:
  • OWNERS [Luap99,TomSweeneyRedHat]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@edsantiago
Copy link
Member

LGTM2

@baude
Copy link
Member

baude commented Nov 11, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 11, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 4002405 into containers:v5.3 Nov 11, 2024
84 of 85 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. No New Tests Allow PR to proceed without adding regression tests release-note-none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants