aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliang gao <jean.gaoliang@huawei.com>2016-10-24 03:07:03 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-10-24 03:07:03 +0000
commit0949a21150461b0b31df5b16b39ff77a6813e821 (patch)
tree734a6f604428f29782a09e0a304bd7faf5e8b80c
parent542caba88c24d7572f22922440ed711ad2a32640 (diff)
parent0079d24676dd0489859ded12e889f9ec06aa6abd (diff)
Merge "Bugfix: Add image modify scripts into environment variables"
-rwxr-xr-xsetup.py5
-rwxr-xr-xtools/ubuntu-server-cloudimg-modify.sh2
2 files changed, 5 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index ba7316d80..4fe2596c8 100755
--- a/setup.py
+++ b/setup.py
@@ -63,5 +63,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 3ef060847..49c842c97 100755
--- 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