summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2021-07-02 14:37:30 +0200
committerValentin Rothberg <rothberg@redhat.com>2021-07-16 14:19:56 +0200
commite1ac0c303342f47dd06f861e312c2e4d10136df3 (patch)
tree1574e90b3461fae7b511bbea3ee5b38ee11a4054 /test
parentf0cd16cb32676eaf5ee337b50e8628f2f49ccce9 (diff)
downloadpodman-e1ac0c303342f47dd06f861e312c2e4d10136df3.tar.gz
podman-e1ac0c303342f47dd06f861e312c2e4d10136df3.tar.bz2
podman-e1ac0c303342f47dd06f861e312c2e4d10136df3.zip
vendor containers/common@main
The `IgnorePlatform` options has been removed from the `LookupImageOptions` in libimage to properly support multi-arch images. Skip one buildah-bud test which requires updated CI images. This is currently being done in github.com/containers/podman/pull/10829 but we need to unblock merging common and buildah into podman. [NO TESTS NEEDED] Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'test')
-rwxr-xr-xtest/buildah-bud/apply-podman-deltas4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/buildah-bud/apply-podman-deltas b/test/buildah-bud/apply-podman-deltas
index 0bf9f298d..41c84257f 100755
--- a/test/buildah-bud/apply-podman-deltas
+++ b/test/buildah-bud/apply-podman-deltas
@@ -155,6 +155,10 @@ skip "FIXME FIXME FIXME we'll figure these out later" \
skip "FIXME FIXME FIXME podman save/load has been fixed (but not yet used in Buildah CI)" \
"bud with --layers and --no-cache flags"
+# see https://github.com/containers/podman/pull/10829
+skip "FIXME FIXME FIXME - requires updated CI images (#10829)" \
+ "bud with --runtime and --runtime-flag"
+
###############################################################################
# BEGIN tests which are skipped due to actual podman bugs.