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

Unify tool install location

Change-Id: I45fc76a0631187136a2602d1a9c26f3df94ce9dd
Signed-off-by: JingLu5 <lvjing5@huawei.com>

diff --git a/tests/unit/benchmark/scenarios/compute/test_ramspeed.py b/tests/unit/benchmark/scenarios/compute/test_ramspeed.py
index 3de84c7..100102d 100644 (file)
--- a/tests/unit/benchmark/scenarios/compute/test_ramspeed.py
+++ b/tests/unit/benchmark/scenarios/compute/test_ramspeed.py
@@ -228,7 +228,8 @@ class RamspeedTestCase(unittest.TestCase):
         args = {'options': options}
         r = ramspeed.Ramspeed(args, self.ctx)
 
-        mock_ssh.SSH().execute.return_value = (1, '', 'No such type_id: 30 for Ramspeed scenario')
+        mock_ssh.SSH().execute.return_value = (1, '', 'No such type_id: 30 for \
+                                               Ramspeed scenario')
         self.assertRaises(RuntimeError, r.run, self.result)
 
 

diff --git a/tools/ubuntu-server-cloudimg-modify.sh b/tools/ubuntu-server-cloudimg-modify.sh
index 4a7d24b..2e8399a 100755 (executable)
--- a/tools/ubuntu-server-cloudimg-modify.sh
+++ b/tools/ubuntu-server-cloudimg-modify.sh
@@ -62,9 +62,8 @@ 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/beefyamoeba5/ramspeed.git /opt/tempT2
-cd /opt/tempT2/ramspeed-2.6.0
+git clone https://github.com/beefyamoeba5/ramspeed.git /opt/tempT/RAMspeed
+cd /opt/tempT/RAMspeed/ramspeed-2.6.0
 mkdir temp
 bash build.sh
 

diff --git a/yardstick/benchmark/scenarios/compute/ramspeed_mark_benchmark.bash b/yardstick/benchmark/scenarios/compute/ramspeed_mark_benchmark.bash
index fcb6559..526d0b9 100644 (file)
--- a/yardstick/benchmark/scenarios/compute/ramspeed_mark_benchmark.bash
+++ b/yardstick/benchmark/scenarios/compute/ramspeed_mark_benchmark.bash
@@ -21,7 +21,7 @@ OUTPUT_FILE=/tmp/ramspeed-out.log
 
 run_ramspeed()
 {
-    cd /opt/tempT2/ramspeed-2.6.0/
+    cd /opt/tempT/RAMspeed/ramspeed-2.6.0/
     ./ramspeed -b $TYPE_ID -g $LOAD -m $BLOCK_SIZE > $OUTPUT_FILE
 }
 

diff --git a/yardstick/benchmark/scenarios/compute/ramspeed_mem_benchmark.bash b/yardstick/benchmark/scenarios/compute/ramspeed_mem_benchmark.bash
index 69c2934..931a063 100644 (file)
--- a/yardstick/benchmark/scenarios/compute/ramspeed_mem_benchmark.bash
+++ b/yardstick/benchmark/scenarios/compute/ramspeed_mem_benchmark.bash
@@ -22,7 +22,7 @@ OUTPUT_FILE=/tmp/ramspeed-out.log
 
 run_ramspeed()
 {
-    cd /opt/tempT2/ramspeed-2.6.0/
+    cd /opt/tempT/RAMspeed/ramspeed-2.6.0/
     ./ramspeed -b $TYPE_ID -g $LOAD -m $BLOCK_SIZE -l $ITERATION > $OUTPUT_FILE
 }