summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxudan <xudan16@huawei.com>2017-05-06 04:46:17 -0400
committerxudan <xudan16@huawei.com>2017-05-09 07:50:07 -0400
commit08d887595903aa7127b42eaa8a04add2a09244fe (patch)
treee22a17c3d5d507a12ea6d13b7ae0348294ca6c98
parente8e815b8b288437e058d8fa4acda22b71726fe34 (diff)
Support Yardstick to push results to database
JIRA: DOVETAIL-421 1. Yardstick is working on supporting push results to mongoDB. see https://gerrit.opnfv.org/gerrit/#/c/34091/ 2. make Dovetail supporting push results to database too when user choose to report to database. Change-Id: Iee06ad6be59dad62ac4f985f4a982fb5ff93a592 Signed-off-by: xudan <xudan16@huawei.com>
-rw-r--r--dovetail/container.py5
-rwxr-xr-xdovetail/run.py19
2 files changed, 10 insertions, 14 deletions
diff --git a/dovetail/container.py b/dovetail/container.py
index ae7c8e2e..67e26f66 100644
--- a/dovetail/container.py
+++ b/dovetail/container.py
@@ -100,8 +100,9 @@ class Container(object):
return None
if dovetail_config['report_dest'].startswith("http"):
- cls.logger.info("Yardstick can't push results to DB.")
- cls.logger.info("Results will be stored with files.")
+ envs = envs + " -e DISPATCHER=http"
+ envs = envs + " -e TARGET=%s" % dovetail_config['report_dest']
+ envs = envs + " -e NODE_NAME=master"
log_vol = '-v %s:%s ' % (dovetail_config['result_dir'],
dovetail_config["yardstick"]['result']['log'])
diff --git a/dovetail/run.py b/dovetail/run.py
index 5b4dca8e..a191e399 100755
--- a/dovetail/run.py
+++ b/dovetail/run.py
@@ -77,19 +77,14 @@ def check_tc_result(testcase, logger):
dovetail_result = os.path.join(result_dir,
dt_cfg.dovetail_config['result_file'])
if dt_cfg.dovetail_config['report_dest'].startswith("http"):
- if validate_type.lower() == 'yardstick':
- logger.info("Results have been stored with file %s.",
- os.path.join(result_dir,
- testcase.validate_testcase() + '.out'))
+ if dt_utils.store_db_results(dt_cfg.dovetail_config['report_dest'],
+ dt_cfg.dovetail_config['build_tag'],
+ testcase.name(), dovetail_result,
+ logger):
+ logger.info("Results have been pushed to database and stored "
+ "with local file %s.", dovetail_result)
else:
- if dt_utils.store_db_results(dt_cfg.dovetail_config['report_dest'],
- dt_cfg.dovetail_config['build_tag'],
- testcase.name(), dovetail_result,
- logger):
- logger.info("Results have been pushed to database and stored "
- "with local file %s.", dovetail_result)
- else:
- logger.error("Fail to push results to database.")
+ logger.error("Fail to push results to database.")
if dt_cfg.dovetail_config['report_dest'] == "file":
if validate_type.lower() == 'yardstick':
logger.info("Results have been stored with file %s.",