diff options
author | liyin <liyin11@huawei.com> | 2018-03-07 03:47:28 +0000 |
---|---|---|
committer | Yu Yang (Gabriel) <Gabriel.yuyang@huawei.com> | 2018-03-15 08:05:16 +0000 |
commit | c7e43d91f4a6babaff1f373b0a7ed102a876e7d3 (patch) | |
tree | 322d9d272e34fe54ac0a390dd578849a9934ed0f /testsuites/posca/testcase_script/posca_factor_multistack_storage_parallel.py | |
parent | ca207611e853332780f61b2a69b999a35e55d0c7 (diff) |
bottlenecks offiline support
JIRA: BOTTLENECK-224
This patch for bottlenecks support offiline.
By use some offiline image rather than yardstick env prepare.
This will solve some problem happened in yardstick image builder.
Change-Id: I62b6606570c2ea6ce365212c79777af01c47c9a6
Signed-off-by: liyin <liyin11@huawei.com>
(cherry picked from commit adf6a02bae295455f584ebab762592dd57e2422c)
Diffstat (limited to 'testsuites/posca/testcase_script/posca_factor_multistack_storage_parallel.py')
-rw-r--r-- | testsuites/posca/testcase_script/posca_factor_multistack_storage_parallel.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/testsuites/posca/testcase_script/posca_factor_multistack_storage_parallel.py b/testsuites/posca/testcase_script/posca_factor_multistack_storage_parallel.py index 58f9dc8c..8c623d41 100644 --- a/testsuites/posca/testcase_script/posca_factor_multistack_storage_parallel.py +++ b/testsuites/posca/testcase_script/posca_factor_multistack_storage_parallel.py @@ -50,10 +50,8 @@ def env_pre(test_config): stack_prepare._prepare_env_daemon(test_yardstick) quota_prepare.quota_env_prepare() if(test_config["contexts"]['yardstick_envpre']): - cmd = ('yardstick env prepare') LOG.info("yardstick environment prepare!") - yardstick_container = docker_env.yardstick_info['container'] - stdout = docker_env.docker_exec_cmd(yardstick_container, cmd) + stdout = yardstick_task.yardstick_image_prepare() LOG.debug(stdout) @@ -78,11 +76,11 @@ def do_test(test_config): loop_value = loop_value + 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") LOG.info("%s" % data["result"]["testcases"]) break - elif data["status"] == 2: + else: LOG.error("yardstick error exit") break @@ -140,6 +138,7 @@ def run(test_config): numjobs = scenarios_conf["num_jobs"] direct = scenarios_conf["direct"] volume_num = scenarios_conf["volume_num"] + volume_size = scenarios_conf["volume_size"] result = [] @@ -151,7 +150,8 @@ def run(test_config): "size": size, "rwmixwrite": rwmixwrite, "numjobs": numjobs, - "direct": direct} + "direct": direct, + "volume_size": int(volume_size)} data_reply = do_test(case_config) result.append(data_reply) |