diff options
author | liyin <liyin11@huawei.com> | 2018-03-07 03:47:28 +0000 |
---|---|---|
committer | Ace Lee <liyin11@huawei.com> | 2018-03-12 02:21:54 +0000 |
commit | adf6a02bae295455f584ebab762592dd57e2422c (patch) | |
tree | 04c01b98d18eed356e4adf542bbcde53b00cafde /testsuites/posca/testcase_script/posca_factor_multistack_storage.py | |
parent | 06db2e37272bb3a030c2b5f2e255ec6a61f17472 (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>
Diffstat (limited to 'testsuites/posca/testcase_script/posca_factor_multistack_storage.py')
-rw-r--r-- | testsuites/posca/testcase_script/posca_factor_multistack_storage.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/testsuites/posca/testcase_script/posca_factor_multistack_storage.py b/testsuites/posca/testcase_script/posca_factor_multistack_storage.py index db4cb736..34ee225c 100644 --- a/testsuites/posca/testcase_script/posca_factor_multistack_storage.py +++ b/testsuites/posca/testcase_script/posca_factor_multistack_storage.py @@ -54,11 +54,9 @@ def env_pre(test_config): test_yardstick = True stack_prepare._prepare_env_daemon(test_yardstick) quota_prepare.quota_env_prepare() - cmd = ('yardstick env prepare') LOG.info("yardstick environment prepare!") if(test_config["contexts"]['yardstick_envpre']): - 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) @@ -83,11 +81,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 @@ -192,6 +190,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"] for value in test_num: result = [] @@ -211,7 +210,8 @@ def run(test_config): "size": size, "rwmixwrite": rwmixwrite, "numjobs": numjobs, - "direct": direct} + "direct": direct, + "volume_size": int(volume_size)} tmp_thread = threading.Thread(target=func_run, args=(case_config,)) threadings.append(tmp_thread) tmp_thread.start() |