github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-06-02 11:45:34 +00:00
Code Issues Projects Releases Wiki Activity

Fix for yet another breaking podman change

Browse Source 
'podman info' changed format, again, without preserving backward
compatibility. Basically, some keys that used to be lower-case
are now upper-case-first-letter.

These tests need to work with new podman on rawhide, and
old podman on f31/f32 and possibly RHEL. We must therefore
add a revolting workaround for the change.

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago 2020-04-08 15:24:06 -06:00
parent 101901ab40
commit cf4dff471c
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
systemtest/010-inspect.bats
View File

@ -87,7 +87,16 @@ END_EXPECT
# 1) Get current platform arch # 1) Get current platform arch
# 2) Inspect container image is different from current platform arch # 2) Inspect container image is different from current platform arch
# 3) Compare output w/ expected result # 3) Compare output w/ expected result
arch=$(podman info --format '{{.host.arch}}')
# Here we see a revolting workaround for a podman incompatibility
# change: in April 2020, podman info completely changed format
# of the keys. What worked until then now throws an error. We
# need to work with both old and new podman.
arch=$(podman info --format '{{.host.arch}}' || true)
if [[ -z "$arch" ]]; then
arch=$(podman info --format '{{.Host.Arch}}')
fi
case $arch in case $arch in
"amd64") "amd64")
diff_arch_list="s390x ppc64le" diff_arch_list="s390x ppc64le"