From: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>
Date: Mon, 8 Feb 2016 14:40:48 +0000 (+0100)
Subject: yardstick image build cleanups
X-Git-Tag: brahmaputra.1.0~27
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F33%2F9533%2F1;p=yardstick.git

yardstick image build cleanups

 - reduce progress verbosity when downloading with wget
 - added some debug printouts for trouble shooting
   mount issues

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

diff --git a/tools/yardstick-img-modify b/tools/yardstick-img-modify
index 5e9b45029..94594103a 100755
--- a/tools/yardstick-img-modify
+++ b/tools/yardstick-img-modify
@@ -57,11 +57,11 @@ download() {
     cd $workspace
     rm -f MD5SUMS # always download the checksum file to a detect stale image
     wget $md5sums_url
-    test -e $filename || wget -nc $image_url
+    test -e $filename || wget -nc --progress=dot:giga $image_url
     grep $filename MD5SUMS | md5sum -c ||
     if [ $? -ne 0 ]; then
         rm $filename
-        wget -nc $image_url
+        wget -nc --progress=dot:giga $image_url
         grep $filename MD5SUMS | md5sum -c
     fi
     qemu-img convert $filename $raw_imgfile
@@ -78,7 +78,10 @@ setup() {
 
     loopdevice=$(kpartx -l $raw_imgfile | head -1 | cut -f1 -d ' ')
 
-    kpartx -a $raw_imgfile
+    kpartx -av $raw_imgfile
+
+    # for trouble shooting
+    sleep 2; dmsetup ls
 
     mount /dev/mapper/$loopdevice $mountdir
     mount -t proc none $mountdir/proc