diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/test/reporting/reporting/utils/reporting_utils.py | 3 | ||||
| -rw-r--r-- | utils/test/reporting/reporting/yardstick/reporting-status.py | 16 |
2 files changed, 15 insertions, 4 deletions
diff --git a/utils/test/reporting/reporting/utils/reporting_utils.py b/utils/test/reporting/reporting/utils/reporting_utils.py index 6c0d5a23f..65267ca11 100644 --- a/utils/test/reporting/reporting/utils/reporting_utils.py +++ b/utils/test/reporting/reporting/utils/reporting_utils.py @@ -186,7 +186,6 @@ def getScenarioStats(scenario_results): def getScenarioStatus(installer, version): """ Get the status of a scenariofor Yardstick - they used criteria SUCCESS (default: PASS) """ period = get_config('general.period') url_base = get_config('testapi.url') @@ -228,7 +227,7 @@ def getScenarioStatus(installer, version): # scenario_results[k] = v[:LASTEST_TESTS] s_list = [] for element in scen_v: - if element['criteria'] == 'SUCCESS': + if element['criteria'] == 'PASS': s_list.append(1) else: s_list.append(0) diff --git a/utils/test/reporting/reporting/yardstick/reporting-status.py b/utils/test/reporting/reporting/yardstick/reporting-status.py index 77e260412..10cacf006 100644 --- a/utils/test/reporting/reporting/yardstick/reporting-status.py +++ b/utils/test/reporting/reporting/yardstick/reporting-status.py @@ -39,7 +39,12 @@ def get_scenario_data(version, installer): return scenarios -def write_history_data(version, scenario, installer, ten_score, percent): +def write_history_data(version, + scenario, + installer, + archi, + ten_score, + percent): # Save daily results in a file history_file = './display/{}/yardstick/scenario_history.txt'.format( version) @@ -49,6 +54,8 @@ def write_history_data(version, scenario, installer, ten_score, percent): f.write('date,scenario,installer,details,score\n') date = datetime.datetime.now().strftime("%Y-%m-%d %H:%M") + if installer == 'fuel': + installer = '{}@{}'.format(installer, archi) with open(history_file, "a") as f: info = '{},{},{},{},{}\n'.format(date, scenario, @@ -121,7 +128,12 @@ def generate_reporting_page(version, installer, archi, scenarios, period): version, scenario) last_score, ten_score, percent, status = do_statistic(data) - write_history_data(version, scenario, installer, ten_score, percent) + write_history_data(version, + scenario, + installer, + archi, + ten_score, + percent) scenario_data[scenario] = ScenarioResult(status, last_score, ten_score, |