Merge "opensuse: better report checksum errors"

This commit is contained in:
Zuul 2022-08-01 14:44:36 +00:00 committed by Gerrit Code Review
commit ac5823cab1

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then if [ ${DIB_DEBUG_TRACE:-0} -gt 1 ]; then
set -x set -x
fi fi
set -eu set -eu
@ -41,12 +41,21 @@ if [ -n "$DIB_OFFLINE" -a -f "$CACHED_FILE" ] ; then
# between image tarball and host OS) # between image tarball and host OS)
sudo tar -C $TARGET_ROOT --numeric-owner -xf $CACHED_FILE sudo tar -C $TARGET_ROOT --numeric-owner -xf $CACHED_FILE
else else
echo "Fetching Base Image" echo "Fetching Base Image ${BASE_IMAGE_FILE}"
$TMP_HOOKS_PATH/bin/cache-url $DIB_CLOUD_IMAGES/$SHA256SUMS_FILE $CACHED_SHA256SUMS_FILE $TMP_HOOKS_PATH/bin/cache-url $DIB_CLOUD_IMAGES/$SHA256SUMS_FILE $CACHED_SHA256SUMS_FILE
$TMP_HOOKS_PATH/bin/extract-image $BASE_IMAGE_FILE $BASE_IMAGE_FILE.tgz $DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE $CACHED_FILE $TMP_HOOKS_PATH/bin/extract-image $BASE_IMAGE_FILE $BASE_IMAGE_FILE.tgz $DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE $CACHED_FILE
pushd $DIB_IMAGE_CACHE pushd $DIB_IMAGE_CACHE
# Calculate sha256sum of downloaded image and check against content from sha256 file # Calculate sha256sum of downloaded image and check against content from sha256 file
SHA256SUM=$(sha256sum ${BASE_IMAGE_FILE} | cut -d " " -f1) SHA256SUM=$(sha256sum ${BASE_IMAGE_FILE} | cut -d " " -f1)
grep -q $SHA256SUM SHA256SUMS.$BASE_IMAGE_FILE SIZE=$(stat -c%s ${BASE_IMAGE_FILE})
echo "Base image has sha256sum:${SHA256SUM} size:${SIZE}"
if grep -q $SHA256SUM SHA256SUMS.$BASE_IMAGE_FILE; then
echo "Image downloaded successfully"
else
echo "*** Checksum mismatch"
cat SHA256SUMS.$BASE_IMAGE_FILE
exit 1
fi
popd popd
fi fi