Skip to content

Conversation

@TomSweeneyRedHat
Copy link
Member

@TomSweeneyRedHat TomSweeneyRedHat commented Oct 22, 2025

Vendor Buildah v1.42.0 into Podman for v5.7.0.
This will also drag in:

go.podman.io/common v0.66.0
go.podman.io/image v5.38.0
go.podman.io/storage v1.61.0

Does this PR introduce a user-facing change?

None

@openshift-ci openshift-ci bot added do-not-merge/release-note-label-needed Enforce release-note requirement, even if just None approved Indicates a PR has been approved by an approver from all required OWNERS files. release-note-none and removed do-not-merge/release-note-label-needed Enforce release-note requirement, even if just None labels Oct 22, 2025
@TomSweeneyRedHat TomSweeneyRedHat added No New Tests Allow PR to proceed without adding regression tests and removed release-note-none labels Oct 22, 2025
@mheon
Copy link
Member

mheon commented Oct 22, 2025

LGTM

@Luap99
Copy link
Member

Luap99 commented Oct 22, 2025

I think we must skip the proxy env test one remote since the env is of course not send over the API.

$ git diff
diff --git a/test/buildah-bud/apply-podman-deltas b/test/buildah-bud/apply-podman-deltas
index 5fa3803b6d..0a076bd5cd 100755
--- a/test/buildah-bud/apply-podman-deltas
+++ b/test/buildah-bud/apply-podman-deltas
@@ -275,6 +275,9 @@ skip_if_remote "This test needs unique TMPDIR for the test and podman-remote doe
 skip_if_remote "compat API does not support oci-archive tags" \
                "build-with-timestamp-applies-to-oci-archive"
 
+skip_if_remote "http_proxy env is not send via remote API" \
+               "build proxy - ADD URL"
+
 ###############################################################################
 # BEGIN tests which are skipped due to actual podman or podman-remote bugs.
 

Vendor Buildah v1.42.0 into Podman for v5.7.0.
This will also drag in:

go.podman.io/common v0.66.0
go.podman.io/image v5.38.0
go.podman.io/storage v1.61.0

Signed-off-by: tomsweeneyredhat <[email protected]>
@TomSweeneyRedHat TomSweeneyRedHat force-pushed the dev/tsweeney/buildah_v1.42.0 branch from 9f33b05 to c72102d Compare October 22, 2025 17:52
@TomSweeneyRedHat
Copy link
Member Author

I just noted a typo in one of my comments. I'll touch that up either for the next loop of this PR if it fails testing or in a separate PR.

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

Looks like it passed now, just flake reruns remaining I think.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 22, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 22, 2025

[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

@openshift-merge-bot openshift-merge-bot bot merged commit 998a8a0 into containers:main Oct 22, 2025
89 of 90 checks passed
TomSweeneyRedHat added a commit to TomSweeneyRedHat/podman that referenced this pull request Oct 22, 2025
After the tests had all but passed on containers#27343, I noted
a minor typo.  This corrects the one character flaw.

Signed-off-by: tomsweeneyredhat <[email protected]>
inknos pushed a commit to inknos/podman that referenced this pull request Oct 23, 2025
After the tests had all but passed on containers#27343, I noted
a minor typo.  This corrects the one character flaw.

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants