Merge "add missing test suite files for new scenarios"

[yardstick.git] / tools / ubuntu-server-cloudimg-modify.sh

diff --git a/tools/ubuntu-server-cloudimg-modify.sh b/tools/ubuntu-server-cloudimg-modify.sh
index 49c842c..fb2ae3f 100755 (executable)
--- 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,11 +46,11 @@ 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
+if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then
+    apt-get install -y \
+        linux-headers-"$(echo ${CLOUD_KERNEL_VERSION} | cut -d'-' -f3,4,5)" \
+        unzip
+    #resize root partition (/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:
@@ -58,10 +58,13 @@ bootcmd:
 EOF
 fi
 apt-get install -y \
+    bc \
     fio \
     git \
     gcc \
     iperf3 \
+    ethtool \
+    iproute2 \
     linux-tools-common \
     linux-tools-generic \
     lmbench \
@@ -73,36 +76,41 @@ apt-get install -y \
     stress \
     sysstat
 
-if [ $YARD_IMG_ARCH = "arm64" ]; then
+CLONE_DEST=/opt/tempT
+
+# remove before cloning
+rm -rf -- "${CLONE_DEST}"
+
+if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; 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
+    mkdir "${CLONE_DEST}"
+    mv byte-unixbench-master/UnixBench "${CLONE_DEST}"
     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
+    -e 's/OPTON += -march=native/OPTON += -march=armv8-a/g' "${CLONE_DEST}/UnixBench/Makefile"
 else
-    git clone https://github.com/kdlucas/byte-unixbench.git /opt/tempT
+    git clone https://github.com/kdlucas/byte-unixbench.git "${CLONE_DEST}"
 fi
-make --directory /opt/tempT/UnixBench/
+make --directory "${CLONE_DEST}/UnixBench/"
 
-if [ $YARD_IMG_ARCH = "arm64" ]; then
+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/
+    mkdir "${CLONE_DEST}/RAMspeed"
+    mv ramspeed-master/* "${CLONE_DEST}/RAMspeed/"
 else
-    git clone https://github.com/beefyamoeba5/ramspeed.git /opt/tempT/RAMspeed
+    git clone https://github.com/beefyamoeba5/ramspeed.git "${CLONE_DEST}/RAMspeed"
 fi
-cd /opt/tempT/RAMspeed/ramspeed-2.6.0
+cd "${CLONE_DEST}/RAMspeed/ramspeed-2.6.0"
 mkdir temp
 bash build.sh
 
-if [ $YARD_IMG_ARCH = "arm64" ]; then
+if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then
     wget https://github.com/beefyamoeba5/cachestat/archive/master.zip
     unzip master.zip && rm master.zip
-    mv cachestat-master/cachestat /opt/tempT
+    mv cachestat-master/cachestat "${CLONE_DEST}"
 else
-    git clone https://github.com/beefyamoeba5/cachestat.git /opt/tempT/Cachestat
+    git clone https://github.com/beefyamoeba5/cachestat.git "${CLONE_DEST}/Cachestat"
 fi
 
 # restore symlink