X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=tools%2Fubuntu-server-cloudimg-modify.sh;h=47e7357c9ae991ecfe570fb8056c37fc0565e787;hb=e88d6092ac3dab2b657247c7f27a2b34d90978dc;hp=c0ae774efe2e2a53720bac78ab2558b0a7bffa27;hpb=e610b655fa141e5ee5382f24a532283dbbace89e;p=yardstick.git

diff --git a/tools/ubuntu-server-cloudimg-modify.sh b/tools/ubuntu-server-cloudimg-modify.sh
index c0ae774ef..47e7357c9 100755
--- a/tools/ubuntu-server-cloudimg-modify.sh
+++ b/tools/ubuntu-server-cloudimg-modify.sh
@@ -24,9 +24,9 @@ if [ $# -eq 1 ]; then
 fi
 
 # iperf3 only available for trusty in backports
-if [ grep -q trusty /etc/apt/sources.list ]; then
-    if [ $YARD_IMG_ARCH = "arm64" ]; then
-        echo "deb [arch=arm64] http://ports.ubuntu.com/ trusty-backports main restricted universe multiverse" >> /etc/apt/sources.list
+if grep -q trusty /etc/apt/sources.list ; then
+    if [ "${YARD_IMG_ARCH}" = "arm64" ]; then
+        echo "deb [arch=${YARD_IMG_ARCH}] http://ports.ubuntu.com/ trusty-backports main restricted universe multiverse" >> /etc/apt/sources.list
     else
         echo "deb http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse" >> /etc/apt/sources.list
     fi
@@ -46,19 +46,9 @@ chpasswd: { expire: False }
 ssh_pwauth: True
 EOF
 apt-get update
-if [ $YARD_IMG_ARCH = "arm64" ]; then
-apt-get install -y \
-    linux-headers-$(echo $VIVID_KERNEL_VERSION | cut -d'-' -f3,4,5) \
-    unzip
-#resize root parition (/dev/vdb1) It is supposed to be default but the image is booted differently for arm64
-cat <<EOF >/etc/cloud/cloud.cfg.d/15_growpart.cfg
-#cloud-config
-bootcmd:
- - [growpart, /dev/vdb, 1]
-EOF
-fi
 apt-get install -y \
     bc \
+    bonnie++ \
     fio \
     git \
     gcc \
@@ -76,37 +66,22 @@ apt-get install -y \
     stress \
     sysstat
 
-if [ $YARD_IMG_ARCH = "arm64" ]; then
-    wget https://github.com/kdlucas/byte-unixbench/archive/master.zip
-    unzip master.zip && rm master.zip
-    mkdir /opt/tempT
-    mv byte-unixbench-master/UnixBench /opt/tempT
-    sed -i -e 's/OPTON += -march=native -mtune=native/OPTON += -march=armv8-a -mtune=generic/g' \
-    -e 's/OPTON += -march=native/OPTON += -march=armv8-a/g' /opt/tempT/UnixBench/Makefile
-else
-    git clone https://github.com/kdlucas/byte-unixbench.git /opt/tempT
-fi
-make --directory /opt/tempT/UnixBench/
+CLONE_DEST=/opt/tempT
 
-if [ $YARD_IMG_ARCH = "arm64" ]; then
-    wget https://github.com/beefyamoeba5/ramspeed/archive/master.zip
-    unzip master.zip && rm master.zip
-    mkdir /opt/tempT/RAMspeed
-    mv ramspeed-master/* /opt/tempT/RAMspeed/
-else
-    git clone https://github.com/beefyamoeba5/ramspeed.git /opt/tempT/RAMspeed
-fi
-cd /opt/tempT/RAMspeed/ramspeed-2.6.0
+# remove before cloning
+rm -rf -- "${CLONE_DEST}"
+
+git clone https://github.com/kdlucas/byte-unixbench.git "${CLONE_DEST}"
+
+make --directory "${CLONE_DEST}/UnixBench/"
+
+git clone https://github.com/beefyamoeba5/ramspeed.git "${CLONE_DEST}/RAMspeed"
+
+cd "${CLONE_DEST}/RAMspeed/ramspeed-2.6.0"
 mkdir temp
 bash build.sh
 
-if [ $YARD_IMG_ARCH = "arm64" ]; then
-    wget https://github.com/beefyamoeba5/cachestat/archive/master.zip
-    unzip master.zip && rm master.zip
-    mv cachestat-master/cachestat /opt/tempT
-else
-    git clone https://github.com/beefyamoeba5/cachestat.git /opt/tempT/Cachestat
-fi
+git clone https://github.com/beefyamoeba5/cachestat.git "${CLONE_DEST}/Cachestat"
 
 # restore symlink
 ln -sf /run/resolvconf/resolv.conf /etc/resolv.conf