diff options
| author |   MatthewLi <matthew.lijun@huawei.com> | 2016-12-22 05:59:08 -0500 |
|---|---|---|
| committer | MatthewLi <matthew.lijun@huawei.com> | 2017-01-05 03:08:35 -0500 |
| commit | 0df018d111bdf817dfb838454caac85236b643da (patch) | |
| tree | 7092c57b4c3bd72bbd309e120efb69cde099c7fd /dovetail/report.py | |
| parent | d8a21638b012c5036ac1303d5fe055a73d8ff1b7 (diff) | |
release tag support
JIRA: DOVETAIL-170
Change-Id: Id56e30fdb3fb5b652e2145dd406b71986997f200
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
Diffstat (limited to 'dovetail/report.py')
| -rw-r--r-- | dovetail/report.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/dovetail/report.py b/dovetail/report.py index 8c302b60..5da6ef87 100644 --- a/dovetail/report.py +++ b/dovetail/report.py @@ -15,6 +15,8 @@ import os import datetime import uuid +from pbr import version + import utils.dovetail_logger as dt_logger from utils.dovetail_config import DovetailConfig as dt_cfg @@ -47,8 +49,8 @@ class Report: @classmethod def generate_json(cls, testsuite_yaml, testarea, duration): report_obj = {} - # TO DO: once version scheme settled, adjust accordingly - report_obj['version'] = '1.0' + report_obj['version'] = \ + version.VersionInfo('dovetail').version_string() report_obj['testsuite'] = testsuite_yaml['name'] # TO DO: once dashboard url settled, adjust accordingly report_obj['dashboard'] = None @@ -112,13 +114,15 @@ class Report: testcase_num[area] = 0 testcase_passnum[area] = 0 - # TO DO: once version scheme settled, adjust accordingly - spec_link = dt_cfg.dovetail_config['repo'] + 'dovetail/testcase' + repo_link = dt_cfg.dovetail_config['repo']['path'] + \ + dt_cfg.dovetail_config['repo']['tag'] + for testcase in report_data['testcases_list']: pattern = re.compile( '|'.join(dt_cfg.dovetail_config['testarea_supported'])) area = pattern.findall(testcase['name'])[0] result_dir = dt_cfg.dovetail_config['result_dir'] + spec_link = repo_link + '/dovetail/testcase' sub_report[area] += '- <%s> %s result: <%s>\n' %\ (spec_link, testcase['name'], result_dir) testcase_num[area] += 1 @@ -135,9 +139,7 @@ class Report: for key in sub_report: if testcase_num[key] != 0: pass_rate = testcase_passnum[key] / testcase_num[key] - # TO DO: once version scheme settled, adjust accordingly - doc_link = dt_cfg.dovetail_config['repo'] +\ - ('docs/testsuites/%s' % key) + doc_link = repo_link + ('/docs/testsuites/%s' % key) report_txt += '- %s results: <%s> pass %.2f%%\n' %\ (key, doc_link, pass_rate * 100) for key in sub_report: |