[NO TESTS NEEDED] Vendor in containers/buildah v1.20.0

[rhatdan]

Signed-off-by: Daniel J Walsh [email protected]

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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:

• OWNERS [rhatdan]

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

[mheon]

LGTM

[TomSweeneyRedHat]

LGTM

[TomSweeneyRedHat]

/lgtm
/hold
hold for tests

[edsantiago]

Sorry about that. This is the downside of bud-under-podman. Suggested diff (it looks complicated, it's not. Most of it is git-sha-change noise. The critical part is the "emergency skip" near the end.

[EDIT: just download the diff, apply it in your tree, commit, and resubmit.]

[edsantiago]

Darn it; looks like git automatically reintroduces the @#$%^ trailing whitespace that my script works so hard to remove.I really despise git some days.

@rhatdan, please try:

$ sed -i -e 's/ \+$//' test/buildah-bud/buildah-tests.diff
$ vim !$ 
[go to bottom of file, and remove the empty last line]

I'm really sorry for the hassle.

[rhatdan]

I tried it by hand. BTW I have no idea why this new test was failing by podman. But we are in a bit of a rush to get podman 3.1 released.

[edsantiago]

I know; that's why I'm hanging out here on my day off. Fingers crossed.

[edsantiago]

Drat. I think hand-editing the .diff broke something:

[+0063s] error: patch fragment without header at line 19: @@ -117,5 +117,6 @@ symlink(subdir)"
[+0063s] hint: Use 'git am --show-current-patch=diff' to see the failed patch
[+0063s] Applying: tweaks for running buildah tests under podman
[+0063s] Patch failed at 0001 tweaks for running buildah tests under podman

[edsantiago]

@rhatdan I'm confused: the string "emergency" (from my emergency patch) does not appear in the diffs I'm looking at; and in fact the SHA in your diff is different than mine. Did you do anything other than (1) apply my diff to your podman working directory, then (2) hand-edit to remove trailing whitespace? Like, did you somehow run git diff and save that? If so, bad things are guaranteed to happen. I would suggest reverting to a clean state of test/buildah/buildah-tests.diff, applying my patch from above, and git-commit-amending that. No other steps whatsoever.

[edsantiago]

FWIW the patch applies cleanly on my end. I have not run the full bud test suite, but I do believe this patch will apply and tests will pass. (Assuming no veth flakes). Fingers crossed.

[edsantiago]

Restarted flake (#9833, the podman-remote race condition). bud is in progress. Fingers still crossed...

[mheon]

/lgtm
/hold cancel