Vendor in containers/buildah v1.21.0

[rhatdan]

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

[rhatdan]

@containers/podman-maintainers PTAL

[giuseppe]

LGTM

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe, 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 [giuseppe,rhatdan]

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

[vrothberg]

/lgtm
/hold

[edsantiago]

@rhatdan if for any reason you need to resubmit, could you please apply this diff?

diff --git a/test/buildah-bud/apply-podman-deltas b/test/buildah-bud/apply-podman-deltas
index 0bf9f298d..59ba157ad 100755
--- a/test/buildah-bud/apply-podman-deltas
+++ b/test/buildah-bud/apply-podman-deltas
@@ -147,14 +147,9 @@ skip "Too much effort to spin up a local registry" \
 skip "FIXME FIXME FIXME: argument-order incompatible with podman" \
      "bud-squash-hardlinks"

-skip "FIXME FIXME FIXME we'll figure these out later" \
-     "bud-multi-stage-nocache-nocommit" \
+skip "FIXME: #10412" \
      "bud with --cgroup-parent"

-# see https://github.com/containers/podman/pull/10147#issuecomment-832503633
-skip "FIXME FIXME FIXME podman save/load has been fixed (but not yet used in Buildah CI)" \
-     "bud with --layers and --no-cache flags"
-
 ###############################################################################
 # BEGIN tests which are skipped due to actual podman bugs.

TL;DR two podman-build bugs are fixed, and tests are passing (on my laptop, anyway). One test still failing, I filed an issue for it.

[mheon]

Restarted red tests

[rhatdan]

/hold cancel