Bugfix: Add image modify scripts into environment variables

JIRA: YARDSTICK-371
JIRA: YARDSTICK-372

This patch fixs two bugs. One is add image modify scripts into environment
variables; The other is fixng a format error in ubuntu-server-cloudimg-modify.sh

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

diff --git a/setup.py b/setup.py
index a2131cf..f28db8f 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -57,5 +57,8 @@ setup(
             'yardstick-plot=yardstick.plot.plotter:main [plot]'
         ],
     },
-    scripts=['tools/yardstick-img-modify']
+    scripts=['tools/yardstick-img-modify',
+             'tools/yardstick-img-lxd-modify',
+             'tools/yardstick-img-dpdk-modify'
+            ]
 )

diff --git a/tools/ubuntu-server-cloudimg-modify.sh b/tools/ubuntu-server-cloudimg-modify.sh
index 3ef0608..49c842c 100755 (executable)
--- a/tools/ubuntu-server-cloudimg-modify.sh
+++ b/tools/ubuntu-server-cloudimg-modify.sh
@@ -24,7 +24,7 @@ if [ $# -eq 1 ]; then
 fi
 
 # iperf3 only available for trusty in backports
-if [grep -q trusty /etc/apt/sources.list ]; then
+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
     else