summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAce Lee <liyin11@huawei.com>2017-08-02 01:47:06 +0000
committerAce Lee <liyin11@huawei.com>2017-08-02 06:19:13 +0000
commitf51763cdf0e40d3a0670fc9c38f4e32686ee91cd (patch)
treec09bbf5a8e0c0653d04453cac89145e4254d3f3d
parentfe6c624370552e141cc80d1b697de7d9717763c9 (diff)
Add yardstick danube3.1 support.
JIRA: BOTTLENECK-173 This patch will add a result handle for Yardstick danube This is only for bottlenecks danube to use. This will change time to 2 min to wait for Yardstick result back Change-Id: Icbd9d89f3e3816df947eaf6f70a12c86f74a2812 Signed-off-by: Ace Lee <liyin11@huawei.com>
-rw-r--r--testsuites/posca/testcase_script/posca_factor_ping.py12
-rw-r--r--utils/infra_setup/runner/docker_env.py2
2 files changed, 6 insertions, 8 deletions
diff --git a/testsuites/posca/testcase_script/posca_factor_ping.py b/testsuites/posca/testcase_script/posca_factor_ping.py
index b212971d..9b3e0a1f 100644
--- a/testsuites/posca/testcase_script/posca_factor_ping.py
+++ b/testsuites/posca/testcase_script/posca_factor_ping.py
@@ -70,21 +70,19 @@ def do_test():
LOG.info(stdout)
out_value = 0
loop_walue = 0
- while loop_walue < 150:
+ while loop_walue < 60:
time.sleep(2)
loop_walue = loop_walue + 1
with open(out_file) as f:
data = json.load(f)
if data["status"] == 1:
- if data["result"]["criteria"] == "PASS":
- LOG.info("yardstick run success")
- out_value = 1
- else:
- LOG.error("task error exit")
- out_value = 0
+ LOG.info("yardstick run success")
+ out_value = 1
break
elif data["status"] == 2:
LOG.error("yardstick error exit")
+ out_value = 0
+ break
q.put((out_value, func_name))
return out_value
diff --git a/utils/infra_setup/runner/docker_env.py b/utils/infra_setup/runner/docker_env.py
index 1e8728eb..ef50f4bc 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 = "danube3.1"
env_docker = client.containers.run(image="opnfv/yardstick:%s"
% yardstick_tag,
privileged=True,