diff options
| author |   Yu Yang (Gabriel) <Gabriel.yuyang@huawei.com> | 2017-08-02 06:41:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-02 06:41:00 +0000 |
| commit | 5eb95eff44e5e2ed35dc04cfe73549a8a160d8ce (patch) | |
| tree | 4ab667b00794e40950d3a54361b4f17e41616959 | |
| parent | 4e50c4bbfb853a197c0e305b32292585bb507c16 (diff) | |
| parent | f51763cdf0e40d3a0670fc9c38f4e32686ee91cd (diff) | |
Merge "Add yardstick danube3.1 support."
| -rw-r--r-- | testsuites/posca/testcase_script/posca_factor_ping.py | 12 | ||||
| -rw-r--r-- | utils/infra_setup/runner/docker_env.py | 2 |
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 2b71965e..ae30417b 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, |