summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliyin <liyin11@huawei.com>2017-07-18 14:55:29 +0800
committerAce Lee <liyin11@huawei.com>2017-07-18 07:55:36 +0000
commit962b6269fdee0991251304a2b16cba78961d4b42 (patch)
tree10b77f6623c1ee8f69989c5ee4b5c08da64996a6
parent75f99aaeadada56dfc974746cd83fec275133a3c (diff)
Bug fix: fit Yardstick 3.1 version.
JIRA: BOTTLENECK-173 This patch will add a file to create some yardstick conf, Yardstick will use this file to manage output file type. Change-Id: I1d265af9f0b9b5132dc63c4d6d95d5bc194c7ff6 Signed-off-by: liyin <liyin11@huawei.com>
-rw-r--r--utils/env_prepare/stack_prepare.py12
1 files changed, 11 insertions, 1 deletions
diff --git a/utils/env_prepare/stack_prepare.py b/utils/env_prepare/stack_prepare.py
index ce8da619..157122ab 100644
--- a/utils/env_prepare/stack_prepare.py
+++ b/utils/env_prepare/stack_prepare.py
@@ -32,9 +32,19 @@ def _prepare_env_daemon(test_yardstick):
if not os.environ.get("EXTERNAL_NETWORK"):
_append_external_network(rc_file)
if test_yardstick:
+ yardstick_contain = docker_env.yardstick_info["container"]
cmd = "cp %s %s" % (rc_file,
config.bottlenecks_config["yardstick_rc_dir"])
- yardstick_contain = docker_env.yardstick_info["container"]
+ docker_env.docker_exec_cmd(yardstick_contain,
+ cmd)
+ file_orig = ("/home/opnfv/repos/yardstick/etc"
+ "/yardstick/yardstick.conf.sample")
+ file_after = "/etc/yardstick/yardstick.conf"
+ cmd = "cp %s %s" % (file_orig,
+ file_after)
+ docker_env.docker_exec_cmd(yardstick_contain,
+ cmd)
+ cmd = "sed -i ā€˜12s/http/file/gā€™ /etc/yardstick/yardstick.conf"
docker_env.docker_exec_cmd(yardstick_contain,
cmd)