Add more debug to image build

Change-Id: Icfbed0433cb9cfb6f8f479fc69699d08ad49602b
Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>
(cherry picked from commit 9de7358215ca6e3f0b394bacdd97f1e2b119b4b4)

2 files changed, 10 insertions, 2 deletions

diff --git a/ci/yardstick-verify b/ci/yardstick-verify
index 97bcacb17..630fed5f5 100755
--- a/ci/yardstick-verify
+++ b/ci/yardstick-verify
@@ -123,7 +123,11 @@ build_yardstick_image()
     echo
     echo "========== Build yardstick cloud image =========="
 
-    sudo $(which yardstick-img-modify) $(pwd)/tools/ubuntu-server-cloudimg-modify.sh
+    local cmd="sudo $(which yardstick-img-modify) $(pwd)/tools/ubuntu-server-cloudimg-modify.sh"
+
+    # Build the image. Retry once if the build fails.
+    $cmd || $cmd
+
     if [ ! -f $QCOW_IMAGE ]; then
         echo "Failed building QCOW image"
         exit 1
diff --git a/tools/yardstick-img-modify b/tools/yardstick-img-modify
index 94594103a..13d4360d9 100755
--- a/tools/yardstick-img-modify
+++ b/tools/yardstick-img-modify
@@ -81,7 +81,9 @@ setup() {
     kpartx -av $raw_imgfile
 
     # for trouble shooting
-    sleep 2; dmsetup ls
+    sleep 2
+    dmsetup ls
+    fdisk -l /dev/${loopdevice:0:5} || true
 
     mount /dev/mapper/$loopdevice $mountdir
     mount -t proc none $mountdir/proc
@@ -136,6 +138,8 @@ error_trap()
         exitcode=$rc
     fi
 
+    dmesg -T | tail -50
+
     cleanup
 
     echo "Image build failed with $exitcode"