ubuntu-server-cloudimg-modify: adjust install location of RAMspeed

[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 bdf96ba..2e8399a 100755 (executable)
--- a/tools/ubuntu-server-cloudimg-modify.sh
+++ b/tools/ubuntu-server-cloudimg-modify.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 ##############################################################################
 # Copyright (c) 2015 Ericsson AB and others.
 #
@@ -7,8 +8,6 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-#!/bin/bash
-
 # installs required packages
 # must be run from inside the image (either chrooted or running)
 
@@ -20,6 +19,8 @@ if [ $# -eq 1 ]; then
     # /etc/resolv.conf is a symbolic link to /run, restore at end
     rm /etc/resolv.conf
     echo "nameserver $nameserver_ip" > /etc/resolv.conf
+    echo "nameserver 8.8.8.8" >> /etc/resolv.conf
+    echo "nameserver 8.8.4.4" >> /etc/resolv.conf
 fi
 
 # iperf3 only available for trusty in backports
@@ -33,21 +34,40 @@ grep trusty /etc/apt/sources.list && \
 echo 'Acquire::ForceIPv4 "true";' > /etc/apt/apt.conf.d/99force-ipv4
 
 # Add hostname to /etc/hosts.
+# Allow console access via pwd
 cat <<EOF >/etc/cloud/cloud.cfg.d/10_etc_hosts.cfg
 manage_etc_hosts: True
+password: RANDOM
+chpasswd: { expire: False }
+ssh_pwauth: True
 EOF
 
 apt-get update
 apt-get install -y \
     fio \
+    git \
+    gcc \
     iperf3 \
     linux-tools-common \
     linux-tools-generic \
     lmbench \
+    make \
     netperf \
+    patch \
+    perl \
     rt-tests \
-    stress
+    stress \
+    sysstat
+
+git clone https://github.com/kdlucas/byte-unixbench.git /opt/tempT
+make --directory /opt/tempT/UnixBench/
+
+git clone https://github.com/beefyamoeba5/ramspeed.git /opt/tempT/RAMspeed
+cd /opt/tempT/RAMspeed/ramspeed-2.6.0
+mkdir temp
+bash build.sh
+
+git clone https://github.com/beefyamoeba5/cachestat.git /opt/tempT/Cachestat
 
 # restore symlink
 ln -sf /run/resolvconf/resolv.conf /etc/resolv.conf
-