diff options
| -rw-r--r-- | jjb/kvmfornfv/kvmfornfv.yml | 2 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docs.yml | 6 | ||||
| -rw-r--r-- | utils/test/reporting/reporting/yardstick/reporting-status.py | 16 |
3 files changed, 18 insertions, 6 deletions
diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml index 2e542acea..ad497e97d 100644 --- a/jjb/kvmfornfv/kvmfornfv.yml +++ b/jjb/kvmfornfv/kvmfornfv.yml @@ -12,7 +12,7 @@ - euphrates: branch: 'stable/{stream}' gs-pathname: '/{stream}' - disabled: false + disabled: true ##################################### # patch verification phases ##################################### diff --git a/jjb/releng/opnfv-docs.yml b/jjb/releng/opnfv-docs.yml index afe8523f2..740274518 100644 --- a/jjb/releng/opnfv-docs.yml +++ b/jjb/releng/opnfv-docs.yml @@ -18,11 +18,11 @@ doc-version: '' gs-pathname: '' disabled: false - - danube: + - euphrates: branch: 'stable/{stream}' - doc-version: '3.0' + doc-version: '5.0.0' gs-pathname: '/{stream}/{doc-version}' - disabled: true + disabled: false ######################## # job templates 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, |