@@ -5,9 +5,13 @@ load helpers
55IMAGE=quay.io/crio/pause
66SIGNED_IMAGE=registry.access.redhat.com/rhel7-atomic:latest
77UNSIGNED_IMAGE=quay.io/crio/hello-world:latest
8+
89IMAGE_LIST_TAG=docker.io/library/alpine:3.9
9- IMAGE_LIST_DIGEST=docker.io/library/alpine@sha256:115731bab0862031b44766733890091c17924f9b7781b79997f5f163be262178
10+ IMAGE_LIST_DIGEST_FOR_TAG=docker.io/library/alpine@sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011
11+ IMAGE_LIST_DIGEST_FOR_TAG_AMD64=docker.io/library/alpine@sha256:65b3a80ebe7471beecbc090c5b2cdd0aafeaefa0715f8f12e40dc918a3a70e32
12+
1013IMAGE_LIST_DIGEST_AMD64=docker.io/library/alpine@sha256:ab3fe83c0696e3f565c9b4a734ec309ae9bd0d74c192de4590fd6dc2ef717815
14+ IMAGE_LIST_DIGEST=docker.io/library/alpine@sha256:ab3fe83c0696e3f565c9b4a734ec309ae9bd0d74c192de4590fd6dc2ef717815
1115
1216function teardown() {
1317 cleanup_test
@@ -312,21 +316,27 @@ function teardown() {
312316 [ " $status " -eq 0 ]
313317 echo " $output "
314318 [ " $output " != " " ]
319+
315320 imageid=" $output "
316321
317- run crictl images -v ${IMAGE_LIST_DIGEST }
322+ run crictl images -v ${IMAGE_LIST_DIGEST_FOR_TAG }
318323 [ " $status " -eq 0 ]
319324 echo " $output "
320- [ " $output " != " " ]
321- [[ " $output " =~ " RepoDigests: ${IMAGE_LIST_DIGEST} " ]]
325+ if [ " $output " == " " ]; then
326+ echo " NOTE: THIS TEST PROBABLY FAILED BECAUSE DIGEST HAS CHANGED, CONSIDER UPDATING TO MATCH THE FOLLOWING DIGEST:"
327+ crictl inspecti ${IMAGE_LIST_TAG} | jq .status.repoDigests
328+ echo " $output "
329+ exit 1
330+ fi
331+ [[ " $output " =~ " RepoDigests: ${IMAGE_LIST_DIGEST_FOR_TAG} " ]]
322332
323333 case $( go env GOARCH) in
324334 amd64)
325- run crictl images -v ${IMAGE_LIST_DIGEST_AMD64 }
335+ run crictl images -v ${IMAGE_LIST_DIGEST_FOR_TAG_AMD64 }
326336 [ " $status " -eq 0 ]
327337 echo " $output "
328338 [ " $output " != " " ]
329- [[ " $output " =~ " RepoDigests: ${IMAGE_LIST_DIGEST_AMD64 } " ]]
339+ [[ " $output " =~ " RepoDigests: ${IMAGE_LIST_DIGEST_FOR_TAG_AMD64 } " ]]
330340 ;;
331341 arm64)
332342 run crictl images -v ${IMAGE_LIST_DIGEST_ARM64}
0 commit comments