diff options
| author |   Yang Yu <Gabriel.yuyang@huawei.com> | 2018-01-03 10:09:16 +0800 |
|---|---|---|
| committer | Yu Yang (Gabriel) <Gabriel.yuyang@huawei.com> | 2018-01-10 01:36:10 +0000 |
| commit | d481acd8c2d994d54b24eb665854a02f29d1d224 (patch) | |
| tree | 02d18233cbbd29abfd5c1481dd5011f9fe90eea7 | |
| parent | 7f3e7fdbccafbb08acf7b04fce9269fe9a4824f3 (diff) | |
bug-fix: wrong line to modify for getting results
In Danube, should modify no.12 line of yardstick config file to
let yardstick record result in file instead of reporting to
MongoDB. After Danube, it should be no.13 line of that file.
Also return to Danube:3.1 and will fix the line issue
for VNF scaling test in another ticket
Change-Id: I309e9c609967efdda8eaaf289d788ccf1693308e
Signed-off-by: Yang Yu <Gabriel.yuyang@huawei.com>
(cherry picked from commit dfffb38551329a52d4c650c30fa88d6c2293ba54)
| -rw-r--r-- | utils/env_prepare/stack_prepare.py | 10 | ||||
| -rw-r--r-- | utils/infra_setup/runner/docker_env.py | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/utils/env_prepare/stack_prepare.py b/utils/env_prepare/stack_prepare.py index 25c2a29b..c7dae390 100644 --- a/utils/env_prepare/stack_prepare.py +++ b/utils/env_prepare/stack_prepare.py @@ -37,6 +37,16 @@ def _prepare_env_daemon(test_yardstick): config.bottlenecks_config["yardstick_rc_dir"]) 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) # update the external_network _source_file(rc_file) diff --git a/utils/infra_setup/runner/docker_env.py b/utils/infra_setup/runner/docker_env.py index 438d3d19..54478ffc 100644 --- a/utils/infra_setup/runner/docker_env.py +++ b/utils/infra_setup/runner/docker_env.py @@ -45,7 +45,7 @@ def env_yardstick(docker_name): volume = get_self_volume() yardstick_tag = os.getenv("Yardstick_TAG") if yardstick_tag is None: - yardstick_tag = "latest" + yardstick_tag = "danube.3.1" env_docker = client.containers.run(image="opnfv/yardstick:%s" % yardstick_tag, privileged=True, |