From e418f024b9f39383315f07c92053cbc73ee2a13d Mon Sep 17 00:00:00 2001
From: Alessandro Comodi <acomodi@antmicro.com>
Date: Wed, 24 Mar 2021 10:13:55 +0100
Subject: [PATCH] hostcheck: apply suggestion from comment and replaced tab
 with spaces

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>
---
 .github/kokoro/steps/hostcheck.sh | 121 +++++++++++++++++-------------
 1 file changed, 69 insertions(+), 52 deletions(-)

diff --git a/.github/kokoro/steps/hostcheck.sh b/.github/kokoro/steps/hostcheck.sh
index 27edc2ca..ae916bab 100755
--- a/.github/kokoro/steps/hostcheck.sh
+++ b/.github/kokoro/steps/hostcheck.sh
@@ -11,59 +11,76 @@ set -e
 
 echo
 echo "========================================"
-echo "Check storage"
+echo "Waiting for storage"
 echo "----------------------------------------"
-# Wait 30 seconds to not check the storage too early.
-sleep 30
-set -x +e
-mount | grep /tmpfs
-MOUNT_RET=$?
-set +x -e
-if [[ $MOUNT_RET != 0 ]] ; then
-	echo "----------------------------------------"
-	echo "Error: No storage is mounted on /tmpfs."
-	echo "----------------------------------------"
+STORAGE_CHECK_ATTEMPTS=1
+while true; do
+       # Check that tmpfs has been mounted correctly.
+       set -x +e
+       mount | grep /tmpfs
+       MOUNT_RET=$?
+       set +x -e
+       if [[ $MOUNT_RET == 0 ]] ; then
+               break;
+       else
+               echo "----------------------------------------"
+               echo "Error: No storage is mounted on /tmpfs."
+               echo "----------------------------------------"
+               echo ""
+       fi
 
-	echo "========================================"
-	echo "Dmesg dump"
-	echo "----------------------------------------"
-	dmesg
+       # Dump debugging information.
+       echo "========================================"
+       echo "Dmesg dump"
+       echo "----------------------------------------"
+       dmesg
 
-	echo "========================================"
-	echo "Partition information"
-	echo "----------------------------------------"
-	echo ""
-	echo "partprobe"
-	echo "----------------------------------------"
-	partprobe -s
-	echo ""
-	echo "cat /proc/partitions"
-	echo "----------------------------------------"
-	cat /proc/partitions
-	echo ""
-	echo "cat /etc/fstab"
-	echo "----------------------------------------"
-	cat /etc/fstab
-	echo ""
-	echo "cat /etc/mtab"
-	echo "----------------------------------------"
-	cat /etc/mtab
-	echo ""
-	echo "lsblk"
-	echo "----------------------------------------"
-	lsblk --list --output 'NAME,KNAME,FSTYPE,MOUNTPOINT,LABEL,UUID,PARTTYPE,PARTLABEL,PARTUUID'
-	echo ""
-	echo "sfdisk"
-	echo "----------------------------------------"
-	sudo sfdisk --list
-	echo ""
-	echo "systemctl | grep mount"
-	echo "----------------------------------------"
-	systemctl | grep mount
-	echo ""
-	echo "systemctl | grep dev"
-	echo "----------------------------------------"
-	systemctl | grep dev
+       echo "========================================"
+       echo "Partition information"
+       echo "----------------------------------------"
+       echo ""
+       echo "partprobe"
+       echo "----------------------------------------"
+       partprobe -s
+       echo ""
+       echo "cat /proc/partitions"
+       echo "----------------------------------------"
+       cat /proc/partitions
+       echo ""
+       echo "cat /etc/fstab"
+       echo "----------------------------------------"
+       cat /etc/fstab
+       echo ""
+       echo "cat /etc/mtab"
+       echo "----------------------------------------"
+       cat /etc/mtab
+       echo ""
+       echo "lsblk"
+       echo "----------------------------------------"
+       lsblk --list --output 'NAME,KNAME,FSTYPE,MOUNTPOINT,LABEL,UUID,PARTTYPE,PARTLABEL,PARTUUID'
+       echo ""
+       echo "sfdisk"
+       echo "----------------------------------------"
+       sudo sfdisk --list
+       echo ""
+       echo "systemctl | grep mount"
+       echo "----------------------------------------"
+       systemctl | grep mount
+       echo ""
+       echo "systemctl | grep dev"
+       echo "----------------------------------------"
+       systemctl | grep dev
 
-	exit $MOUNT_RET
-fi
+       # Fail if we have waited to long.
+       if [[ $STORAGE_CHECK_ATTEMPTS -gt 5 ]]; then
+               exit $MOUNT_RET
+       else
+               STORAGE_CHECK_ATTEMPTS=$(( $STORAGE_CHECK_ATTEMPTS + 1 ))
+       fi
+
+       # Wait for a bit before rechecking.
+       SLEEP_FOR=$(( STORAGE_CHECK_ATTEMPTS * 10 ))
+       echo ""
+       echo "Sleeping for $SLEEP_FOR seconds before trying again..."
+       sleep $SLEEP_FOR
+done