From: Morgan Richomme Date: Mon, 13 Mar 2017 14:29:58 +0000 (+0100) Subject: Update reporting page for Danube X-Git-Tag: danube.1.0~148^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7060debf7f1b5280239eb0fbf395052b1f1343e3;p=releng.git Update reporting page for Danube - add danube in config to generate results - create new web pages for Euphrates (master) Change-Id: I11b3f37a0f6040a3d0c18820a08a9d6fb7ebe036 Signed-off-by: Morgan Richomme --- diff --git a/utils/test/reporting/functest/reporting-status.py b/utils/test/reporting/functest/reporting-status.py index 95f9e66e8..af1d1d8a5 100755 --- a/utils/test/reporting/functest/reporting-status.py +++ b/utils/test/reporting/functest/reporting-status.py @@ -98,8 +98,14 @@ for version in versions: scenario_stats = rp_utils.getScenarioStats(scenario_results) items = {} scenario_result_criteria = {} - scenario_file_name = ("./display/" + version + - "/functest/scenario_history.txt") + scenario_directory = "./display/" + version + "/functest/" + scenario_file_name = scenario_directory + "scenario_history.txt" + + # check that the directory exists, if not create it + # (first run on new version) + if not os.path.exists(scenario_directory): + os.makedirs(scenario_directory) + # initiate scenario file if it does not exist if not os.path.isfile(scenario_file_name): with open(scenario_file_name, "a") as my_file: @@ -122,7 +128,9 @@ for version in versions: if len(s_result) > 0: build_tag = s_result[len(s_result)-1]['build_tag'] logger.debug("Build tag: %s" % build_tag) - s_url = s_url = rp_utils.getJenkinsUrl(build_tag) + s_url = rp_utils.getJenkinsUrl(build_tag) + if s_url is None: + s_url = "http://testresultS.opnfv.org/reporting" logger.info("last jenkins url: %s" % s_url) testCases2BeDisplayed = [] # Check if test case is runnable / installer, scenario diff --git a/utils/test/reporting/html/danube.html b/utils/test/reporting/html/danube.html index d21875b53..d63e19d90 100644 --- a/utils/test/reporting/html/danube.html +++ b/utils/test/reporting/html/danube.html @@ -1,124 +1,124 @@ - - - - - Phantom by HTML5 UP - - - - - - - - - -

- - - - - - - -

Danube reporting (Master)

- -

- - -

Functest

Functional testing

- -

- - -

Yardstick

Qualification and performance testing

- -

- - -

Storperf

Storage testing

- -

- - - - -

- - - - - - - - - - + + + + + Phantom by HTML5 UP + + + + + + + + + +

+ + + + + + + +

Danube reporting

+ +

+ + +

Functest

Functional testing

+ +

+ + +

Yardstick

Qualification and performance testing

+ +

+ + +

Storperf

Storage testing

+ +

+ + + + +

+ + + + + + + + + + diff --git a/utils/test/reporting/html/functest-danube.html b/utils/test/reporting/html/functest-danube.html new file mode 100644 index 000000000..ac99cb057 --- /dev/null +++ b/utils/test/reporting/html/functest-danube.html @@ -0,0 +1,124 @@ + + + + + Phantom by HTML5 UP + + + + + + + + + +

+ + + + + + + +

Functest reporting

+ +

+ + +

Status

Scenario status

+ +

+ + +

vIMS

Virtual IMS

+ +

+ + +

Tempest

Tempest OpenStack suite

+ +

+ + + + +

+ + + + + + + + + + diff --git a/utils/test/reporting/html/functest-master.html b/utils/test/reporting/html/functest-master.html index 03217a6bd..4b1f76347 100644 --- a/utils/test/reporting/html/functest-master.html +++ b/utils/test/reporting/html/functest-master.html @@ -1,124 +1,124 @@ - - - - - Phantom by HTML5 UP - - - - - - - - - -

- - - - - - - -

Functest reporting

- -

- - -

Status

Scenario status

- -

- - -

vIMS

Virtual IMS

- -

- - -

Tempest

Tempest OpenStack suite

- -

- - - - -

- - - - - - - - - - + + + + + Phantom by HTML5 UP + + + + + + + + + +

+ + + + + + + +

Functest reporting

+ +

+ + +

Status

Scenario status

+ +

+ + +

vIMS

Virtual IMS

+ +

+ + +

Tempest

Tempest OpenStack suite

+ +

+ + + + +

+ + + + + + + + + + diff --git a/utils/test/reporting/html/index.html b/utils/test/reporting/html/index.html index b2b8b46f8..c6627ffe5 100644 --- a/utils/test/reporting/html/index.html +++ b/utils/test/reporting/html/index.html @@ -1,113 +1,124 @@ - - - - - OPNFV reporting - - - - - - - - - -

- - - - - - - -

OPNFV Testing group reporting

- -

- - -

Colorado

Colorado 1.0 released on the 22nd of September

- -

- - -

Danube

Master

- -

- - - - -

- - - - - - - - - - + + + + + OPNFV reporting + + + + + + + + + +

+ + + + + + + +

OPNFV Testing group reporting

+ +

+ + +

Colorado

Colorado 1.0 released on the 22nd of September

+ +

+ + +

Danube

Danube 1.0 planned on the 22nd of March

+ +

+ + +

Euphrates

Master

+ +

+ + + + +

+ + + + + + + + + + diff --git a/utils/test/reporting/html/master.html b/utils/test/reporting/html/master.html new file mode 100644 index 000000000..438bf2023 --- /dev/null +++ b/utils/test/reporting/html/master.html @@ -0,0 +1,124 @@ + + + + + Phantom by HTML5 UP + + + + + + + + + +

+ + + + + + + +

Master reporting

+ +

+ + +

Functest

Functional testing

+ +

+ + +

Yardstick

Qualification and performance testing

+ +

+ + +

Storperf

Storage testing

+ +

+ + + + +

+ + + + + + + + + + diff --git a/utils/test/reporting/img/euphrates.jpg b/utils/test/reporting/img/euphrates.jpg new file mode 100644 index 000000000..3625b50cb Binary files /dev/null and b/utils/test/reporting/img/euphrates.jpg differ diff --git a/utils/test/reporting/reporting.yaml b/utils/test/reporting/reporting.yaml index 81e976a28..33c7cc257 100644 --- a/utils/test/reporting/reporting.yaml +++ b/utils/test/reporting/reporting.yaml @@ -8,6 +8,7 @@ general: versions: - master + - danube log: log_file: reporting.log diff --git a/utils/test/reporting/utils/reporting_utils.py b/utils/test/reporting/utils/reporting_utils.py index 47d67f362..aab7a3f4f 100644 --- a/utils/test/reporting/utils/reporting_utils.py +++ b/utils/test/reporting/utils/reporting_utils.py @@ -283,6 +283,9 @@ def getJenkinsUrl(build_tag): except: print('Impossible to get jenkins url:') + if "jenkins-" not in build_tag: + jenkins_url = None + return jenkins_url