Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Modify grafana config for TC002_Ping as ping output format has been changed"
[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
11e6051
..
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.
#
##############################################################################
# Copyright (c) 2015 Ericsson AB and others.
#
@@
-7,8
+8,6
@@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-#!/bin/bash
-
# installs required packages
# must be run from inside the image (either chrooted or running)
# installs required packages
# must be run from inside the image (either chrooted or running)
@@
-35,8
+34,12
@@
grep trusty /etc/apt/sources.list && \
echo 'Acquire::ForceIPv4 "true";' > /etc/apt/apt.conf.d/99force-ipv4
# Add hostname to /etc/hosts.
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
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
EOF
apt-get update
@@
-58,5
+61,13
@@
apt-get install -y \
git clone https://github.com/kdlucas/byte-unixbench.git /opt/tempT
make --directory /opt/tempT/UnixBench/
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
# restore symlink
ln -sf /run/resolvconf/resolv.conf /etc/resolv.conf