diff options
author | JingLu5 <lvjing5@huawei.com> | 2016-10-17 08:37:43 +0800 |
---|---|---|
committer | JingLu5 <lvjing5@huawei.com> | 2016-10-17 14:27:06 +0800 |
commit | 0079d24676dd0489859ded12e889f9ec06aa6abd (patch) | |
tree | dd47c6936ae6cbb8c397546bae0db0bd268657ff | |
parent | 4490df181d41d77c48b7b1f715dd6ef51a37d585 (diff) |
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>
-rwxr-xr-x | setup.py | 5 | ||||
-rwxr-xr-x | tools/ubuntu-server-cloudimg-modify.sh | 2 |
2 files changed, 5 insertions, 2 deletions
@@ -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 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 |