X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tools%2Fyardstick-img-modify;h=599768555528a32f1c42483bc944307c009df625;hb=029bbae1bd73dd50e146d069c6080cd0f0064126;hp=658717c7110caa0ac3dd027417da1e511c1d8b02;hpb=fe655f15b0838b41c8c91543898ceebf23f1494c;p=yardstick.git

diff --git a/tools/yardstick-img-modify b/tools/yardstick-img-modify
index 658717c71..599768555 100755
--- a/tools/yardstick-img-modify
+++ b/tools/yardstick-img-modify
@@ -76,27 +76,6 @@ download() {
         [ -a /dev/loop$i ] || mknod -m 660 /dev/loop$i b 7 $i
     done
 
-    if [[ "${YARD_IMG_ARCH}" = "arm64"  && "$release" = "vivid" ]]; then
-        cd /tmp
-        if [ ! -f /tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}-kernel-info.txt ]; then
-            wget http://${host}/${release}/current/${release}-server-cloudimg-${YARD_IMG_ARCH}-kernel-info.txt
-        fi
-        export CLOUD_KERNEL_VERSION=$(cut -d$'\t' -f4 ${release}-server-cloudimg-${YARD_IMG_ARCH}-kernel-info.txt)
-
-        mkdir -p /tmp/${release}-modules
-        if [ ! -f "/tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}.tar.gz" ]; then
-            wget $CLOUD_IMG_URL
-        fi
-        if [ ! -f "/tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}.img" ]; then
-            tar zxvf ${release}-server-cloudimg-${YARD_IMG_ARCH}.tar.gz ${release}-server-cloudimg-${YARD_IMG_ARCH}.img
-        fi
-        mkdir -p /mnt/${release}
-        mount /tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}.img /mnt/${release}
-        cp -r /mnt/${release}/lib/modules/$(echo $CLOUD_KERNEL_VERSION) /tmp/${release}-modules
-        umount /mnt/${release}
-        rm /tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}.img
-        cd $workspace
-    fi
     qemu-img convert $filename $raw_imgfile
     cd -
 }
@@ -104,19 +83,12 @@ download() {
 # mount image
 setup() {
     # qemu-img resize $raw_imgfile +5GB
-    if [ "${YARD_IMG_ARCH}" = "arm64" ]; then
-        echo -e "d\nn\np\n1\n\n\nw" | parted -l $raw_imgfile
-    fi
     mkdir -p $mountdir
 
     loopdevice=$(kpartx -l $raw_imgfile | head -1 | cut -f1 -d ' ')
 
     kpartx -av $raw_imgfile
 
-    if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then
-        e2fsck -p -f /dev/mapper/$loopdevice
-        resize2fs /dev/mapper/$loopdevice
-    fi
     # for trouble shooting
     sleep 2
     dmsetup ls
@@ -124,11 +96,10 @@ setup() {
     mount /dev/mapper/$loopdevice $mountdir
     mount -t proc none $mountdir/proc
 
-    if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then
-        cp -r /tmp/${release}-modules/$(echo $CLOUD_KERNEL_VERSION) "$mountdir/lib/modules"
-        cp $(which "qemu-aarch64-static") "$mountdir/usr/bin"
-    fi
     cp $cmd $mountdir/$(basename $cmd)
+    if [ "${YARD_IMG_ARCH}" = "arm64" ]; then
+        cp /usr/bin/qemu-aarch64-static $mountdir/usr/bin
+    fi
 }
 
 # modify image running a script using in a chrooted environment