bud-...-base-as-default : fix dup-arm flake

Some sort of weird error with duplicate "arm" string in manifest output. Started blowing up in podman CI today. Fixes: containers#4520 Signed-off-by: Ed Santiago <[email protected]>
edsantiago · Jan 17, 2023 · 836f021 · 836f021
1 parent c541c35
commit 836f021
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/tests/bud.bats b/tests/bud.bats
@@ -5309,9 +5309,11 @@ _EOF
               -f $BUDFILES/all-platform/Containerfile.default-arg \
               $BUDFILES/all-platform
 
+  # #4520: 'sort -u' needed because sometimes there's a duplicate "arm" in
+  # manifest output; on 2023-01-16 this started blowing up in podman CI.
   run_buildah manifest inspect $outputlist
-  manifests=$(jq -r '.manifests[].platform.architecture' <<<"$output" |sort|fmt)
-  assert "$manifests" = "386 amd64 arm arm arm64 ppc64le s390x" "arch list in manifest"
+  manifests=$(jq -r '.manifests[].platform.architecture' <<<"$output" |sort -u|fmt)
+  assert "$manifests" = "386 amd64 arm arm64 ppc64le s390x" "arch list in manifest"
 }
 
 @test "bud-multiple-platform for --all-platform with additional-build-context" {