JIRA: BOTTLENECK-176
Add function which could modify outfile name.
Also a bug fix about yardstick docker version should be danube.3.1
Change-Id: I0e0bb5b26cae44358311d17932c698505560974c
Signed-off-by: liyin <liyin11@huawei.com>
volume = get_self_volume()
yardstick_tag = os.getenv("Yardstick_TAG")
if yardstick_tag is None:
volume = get_self_volume()
yardstick_tag = os.getenv("Yardstick_TAG")
if yardstick_tag is None:
- yardstick_tag = "danube3.1"
+ yardstick_tag = "danube.3.1"
env_docker = client.containers.run(image="opnfv/yardstick:%s"
% yardstick_tag,
privileged=True,
env_docker = client.containers.run(image="opnfv/yardstick:%s"
% yardstick_tag,
privileged=True,
@classmethod
def testcase_out_dir(cls, testcase):
@classmethod
def testcase_out_dir(cls, testcase):
- suffix_name = os.getenv("SUFFIX_STRING")
- if suffix_name is None:
+ file_name = os.getenv("OUTPUT_FILE")
+ if file_name is None:
file_suffix = time.strftime('%H_%M', time.localtime(time.time()))
file_suffix = time.strftime('%H_%M', time.localtime(time.time()))
+ suffix_name = "_" + str(file_suffix)
+ out_name = cls.bottlenecks_config["log_dir"] + testcase
+ outfile_name = out_name + suffix_name + ".out"
- file_suffix = suffix_name
- suffix_name = str(suffix_name)
- suffix_name = "_" + suffix_name
- out_name = cls.bottlenecks_config["log_dir"] + testcase + file_suffix
- outfile_name = out_name + ".out"
+ out_name = str(file_name)
+ outfile_name = cls.bottlenecks_config["log_dir"] + out_name
return outfile_name
@staticmethod
return outfile_name
@staticmethod