From 292962d34c7e43a3ad036465f3f82f5db86855a5 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Thu, 12 Jan 2023 13:11:34 -0500 Subject: [PATCH] Fix unnecessary use of podman in CI test For whatever reasons, the podman configuration in CI results in the inspect test throwing the following error: ``` not ok 4 inspect: image manifest list w/ diff platform 125 configuration is unset - using hardcoded default graph root \"/var/lib/containers/storage\"" configuration is unset - using hardcoded default graph root \"/var/lib/containers/storage\"" StoreOptions ``` Fix this by not using `podman`. It's unnecessary, since all the test needs is the golang-flavor of the current system's architecture name. That can easily be obtained by asking the go tool directly. Signed-off-by: Chris Evich --- systemtest/010-inspect.bats | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/systemtest/010-inspect.bats b/systemtest/010-inspect.bats index 97137acf..548174da 100644 --- a/systemtest/010-inspect.bats +++ b/systemtest/010-inspect.bats @@ -95,10 +95,11 @@ END_EXPECT # is created by the make-noarch-manifest script in this directory. img=docker://quay.io/libpod/notmyarch:20210121 - # Get our host arch (what we're running on). This assumes that skopeo - # arch matches podman; it also assumes running podman >= April 2020 - # (prior to that, the format keys were lower-case). - arch=$(podman info --format '{{.Host.Arch}}') + # Get our host golang arch (what we're running on, according to golang). + # This assumes that skopeo arch matches host arch (which it always should). + # Buildah is used here because it depends less on the exact system config + # than podman - and all we're really after is the golang-flavored arch name. + arch=$(go env GOARCH) # By default, 'inspect' tries to match our host os+arch. This should fail. run_skopeo 1 inspect $img