Merge "add memory_load scenario"

[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 0e9bb41..f9e0a2c 100755 (executable)
--- a/tools/ubuntu-server-cloudimg-modify.sh
+++ b/tools/ubuntu-server-cloudimg-modify.sh
@@ -20,6 +20,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
@@ -27,17 +29,45 @@ grep trusty /etc/apt/sources.list && \
     echo "deb http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse" >> /etc/apt/sources.list
 
 # Workaround for building on CentOS (apt-get is not working with http sources)
-sed -i 's/http/ftp/' /etc/apt/sources.list
+# sed -i 's/http/ftp/' /etc/apt/sources.list
+
+# Force apt to use ipv4 due to build problems on LF POD.
+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 \
-    stress
+    make \
+    netperf \
+    patch \
+    perl \
+    rt-tests \
+    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/tempT2
+cd /opt/tempT2/ramspeed-2.6.0
+mkdir temp
+bash build.sh
 
 # restore symlink
 ln -sf /run/resolvconf/resolv.conf /etc/resolv.conf
-