tests: image-verify: enable validation of zero-layer images

oci-image-tool would error out if an image manifest had an empty set of
layers, but the docker-library meta-scripts support this fine so we can
re-enable these validations.

This removes the last set of commented-out image-verify checks.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>

Author: cyphar

test/create.bats

@@ -151,14 +151,12 @@ function teardown() {
 	# Create a new image.
 	umoci new --image "${IMAGE}:${TAG}"
 	[ "$status" -eq 0 ]
-	# XXX: oci-image-tool validate doesn't like empty images (without layers)
-	#image-verify "$IMAGE"
+	image-verify "$IMAGE"
 
 	# Modify the config.
 	umoci config --image "${IMAGE}:${TAG}" --config.user "1234:1332"
 	[ "$status" -eq 0 ]
-	# XXX: oci-image-tool validate doesn't like empty images (without layers)
-	#image-verify "$IMAGE"
+	image-verify "$IMAGE"
 
 	# Unpack the image.
 	new_bundle_rootfs
@@ -191,9 +189,7 @@ function teardown() {
 	[ "$status" -eq 0 ]
 	# There should be no non-empty_layers.
 	[[ "$(echo "$output" | jq -SM '[.history[] | .empty_layer == null] | any')" == "false" ]]
-
-	# XXX: oci-image-tool validate doesn't like empty images (without layers)
-	#image-verify "$IMAGE"
+	image-verify "$IMAGE"
 }
 
 # Given the bad experiences we've had with Go compiler changes resulting in
@@ -225,8 +221,7 @@ function teardown() {
 	# Create a new image with another tag.
 	umoci new --image "${IMAGE}:${TAG}"
 	[ "$status" -eq 0 ]
-	# XXX: oci-image-tool validate doesn't like empty images (without layers)
-	#image-verify "$IMAGE"
+	image-verify "$IMAGE"
 
 	# Unpack the image.
 	new_bundle_rootfs

test/raw-add-layer.bats

@@ -56,7 +56,7 @@ function teardown() {
 	# Add layers to the image.
 	umoci new --image "${IMAGE}:${TAG}"
 	[ "$status" -eq 0 ]
-	#image-verify "${IMAGE}"
+	image-verify "${IMAGE}"
 	umoci raw add-layer --image "${IMAGE}:${TAG}" "$UMOCI_TMPDIR/layer1.tar"
 	[ "$status" -eq 0 ]
 	image-verify "${IMAGE}"
@@ -100,7 +100,7 @@ OCI_MEDIATYPE_LAYER="application/vnd.oci.image.layer.v1.tar"
 	# Add layer to the image.
 	umoci new --image "${IMAGE}:${TAG}"
 	[ "$status" -eq 0 ]
-	#image-verify "${IMAGE}"
+	image-verify "${IMAGE}"
 	umoci raw add-layer --image "${IMAGE}:${TAG}" --compress=gzip "$UMOCI_TMPDIR/layer.tar"
 	[ "$status" -eq 0 ]
 	image-verify "${IMAGE}"
@@ -130,7 +130,7 @@ OCI_MEDIATYPE_LAYER="application/vnd.oci.image.layer.v1.tar"
 	# Add layer to the image.
 	umoci new --image "${IMAGE}:${TAG}"
 	[ "$status" -eq 0 ]
-	#image-verify "${IMAGE}"
+	image-verify "${IMAGE}"
 	umoci raw add-layer --image "${IMAGE}:${TAG}" --compress=zstd "$UMOCI_TMPDIR/layer.tar"
 	[ "$status" -eq 0 ]
 	image-verify "${IMAGE}"
@@ -160,7 +160,7 @@ OCI_MEDIATYPE_LAYER="application/vnd.oci.image.layer.v1.tar"
 	# Add layer to the image.
 	umoci new --image "${IMAGE}:${TAG}"
 	[ "$status" -eq 0 ]
-	#image-verify "${IMAGE}"
+	image-verify "${IMAGE}"
 	umoci raw add-layer --image "${IMAGE}:${TAG}" --compress=none "$UMOCI_TMPDIR/layer.tar"
 	[ "$status" -eq 0 ]
 	image-verify "${IMAGE}"
@@ -190,7 +190,7 @@ OCI_MEDIATYPE_LAYER="application/vnd.oci.image.layer.v1.tar"
 	# Add zstd layer to the image.
 	umoci new --image "${IMAGE}:${TAG}"
 	[ "$status" -eq 0 ]
-	#image-verify "${IMAGE}"
+	image-verify "${IMAGE}"
 	umoci raw add-layer --image "${IMAGE}:${TAG}" --compress=zstd "$UMOCI_TMPDIR/layer.tar"
 	[ "$status" -eq 0 ]
 	image-verify "${IMAGE}"