diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/infra_setup/runner/docker_env.py | 2 | ||||
| -rw-r--r-- | utils/parser.py | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/utils/infra_setup/runner/docker_env.py b/utils/infra_setup/runner/docker_env.py index 1e8728eb..64d049ba 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 = "danube.3.1" env_docker = client.containers.run(image="opnfv/yardstick:%s" % yardstick_tag, privileged=True, diff --git a/utils/parser.py b/utils/parser.py index 65072c06..2cdec57b 100644 --- a/utils/parser.py +++ b/utils/parser.py @@ -83,9 +83,15 @@ class Parser(): @classmethod def testcase_out_dir(cls, testcase): - file_time = time.strftime('%H_%M', time.localtime(time.time())) - out_name = cls.bottlenecks_config["log_dir"] + testcase + file_time - outfile_name = out_name + ".out" + file_name = os.getenv("OUTPUT_FILE") + if file_name is None: + 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" + else: + out_name = str(file_name) + outfile_name = cls.bottlenecks_config["log_dir"] + out_name return outfile_name @staticmethod |