From 0ef1b046faf349bbd6f6c7bda669d4ad095ae538 Mon Sep 17 00:00:00 2001 From: mrichomme Date: Mon, 9 Apr 2018 09:18:32 +0200 Subject: Minor fix for Fraser reporting * put functest pages under functest directory (nomore at root) * fix tempest reporting (change of data model for the results) * remove colorado and danube Change-Id: I9fdb3a8cf6f0d12668467bb8bccea4bd57436e50 Signed-off-by: mrichomme --- reporting/docker/reporting.sh | 7 +- reporting/html/colorado.html | 2 +- reporting/html/danube.html | 2 +- reporting/html/euphrates.html | 2 +- reporting/html/fraser.html | 2 +- reporting/html/functest-colorado.html | 124 ---------------------- reporting/html/functest-danube.html | 124 ---------------------- reporting/html/functest-euphrates.html | 109 ------------------- reporting/html/functest-fraser.html | 109 ------------------- reporting/html/functest-master.html | 124 ---------------------- reporting/html/functest.html | 108 +++++++++++++++++++ reporting/html/index.html | 24 +---- reporting/html/master.html | 2 +- reporting/reporting/functest/reporting-tempest.py | 26 +++-- reporting/reporting/functest/reporting-vims.py | 2 +- 15 files changed, 139 insertions(+), 628 deletions(-) delete mode 100644 reporting/html/functest-colorado.html delete mode 100644 reporting/html/functest-danube.html delete mode 100644 reporting/html/functest-euphrates.html delete mode 100644 reporting/html/functest-fraser.html delete mode 100644 reporting/html/functest-master.html create mode 100644 reporting/html/functest.html diff --git a/reporting/docker/reporting.sh b/reporting/docker/reporting.sh index 9648ee0..ee9dccf 100755 --- a/reporting/docker/reporting.sh +++ b/reporting/docker/reporting.sh @@ -3,7 +3,7 @@ export PYTHONPATH="${PYTHONPATH}:./reporting" export CONFIG_REPORTING_YAML=./reporting/reporting.yaml -declare -a versions=(fraser euphrates danube master) +declare -a versions=(fraser euphrates master) declare -a projects=(functest storperf yardstick qtip vsperf bottlenecks) project=$1 @@ -25,6 +25,11 @@ cp -Rf html/* display cp -Rf img display cp -Rf js display +for i in "${versions[@]}" +do + cp -Rf html/functest.html display/$i/functest +done + # if nothing is precised run all the reporting generation # projet | option # $1 | $2 diff --git a/reporting/html/colorado.html b/reporting/html/colorado.html index 58cb009..7a7326e 100644 --- a/reporting/html/colorado.html +++ b/reporting/html/colorado.html @@ -58,7 +58,7 @@ - +

Functest

Functional testing

diff --git a/reporting/html/danube.html b/reporting/html/danube.html index e06d6e5..ae8a3ac 100644 --- a/reporting/html/danube.html +++ b/reporting/html/danube.html @@ -58,7 +58,7 @@ - +

Functest

Functional testing

diff --git a/reporting/html/euphrates.html b/reporting/html/euphrates.html index 1828fc7..e357edc 100644 --- a/reporting/html/euphrates.html +++ b/reporting/html/euphrates.html @@ -42,7 +42,7 @@ - +

Functest

Functional testing

diff --git a/reporting/html/fraser.html b/reporting/html/fraser.html index df97617..65b996c 100644 --- a/reporting/html/fraser.html +++ b/reporting/html/fraser.html @@ -42,7 +42,7 @@ - +

Functest

Functional testing

diff --git a/reporting/html/functest-colorado.html b/reporting/html/functest-colorado.html deleted file mode 100644 index 2fc76d1..0000000 --- a/reporting/html/functest-colorado.html +++ /dev/null @@ -1,124 +0,0 @@ - - - - - Phantom by HTML5 UP - - - - - - - - - -
- - - - - - - - - - -
-
-
-

OPNFV Testing Working group

-
-
-

Follow

- -
-
    -
  • © Untitled. All rights reserved
  • Design: HTML5 UP
    • -
-
-
- -
- - - - - - - - - - diff --git a/reporting/html/functest-danube.html b/reporting/html/functest-danube.html deleted file mode 100644 index ac99cb0..0000000 --- a/reporting/html/functest-danube.html +++ /dev/null @@ -1,124 +0,0 @@ - - - - - Phantom by HTML5 UP - - - - - - - - - -
- - - - - - - - - - -
-
-
-

OPNFV Testing Working group

-
-
-

Follow

- -
-
    -
  • © Untitled. All rights reserved
  • Design: HTML5 UP
    • -
-
-
- -
- - - - - - - - - - diff --git a/reporting/html/functest-euphrates.html b/reporting/html/functest-euphrates.html deleted file mode 100644 index c203e61..0000000 --- a/reporting/html/functest-euphrates.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - Phantom by HTML5 UP - - - - - - - - - -
- - - - - - - - - - -
-
-
-

OPNFV Testing Working group

-
-
-

Follow

- -
-
    -
  • © Untitled. All rights reserved
  • Design: HTML5 UP
    • -
-
-
- -
- - - - - - - - - - diff --git a/reporting/html/functest-fraser.html b/reporting/html/functest-fraser.html deleted file mode 100644 index 9b4c201..0000000 --- a/reporting/html/functest-fraser.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - Phantom by HTML5 UP - - - - - - - - - -
- - - - - - - - - - -
-
-
-

OPNFV Testing Working group

-
-
-

Follow

- -
-
    -
  • © Untitled. All rights reserved
  • Design: HTML5 UP
    • -
-
-
- -
- - - - - - - - - - diff --git a/reporting/html/functest-master.html b/reporting/html/functest-master.html deleted file mode 100644 index 4b1f763..0000000 --- a/reporting/html/functest-master.html +++ /dev/null @@ -1,124 +0,0 @@ - - - - - Phantom by HTML5 UP - - - - - - - - - -
- - - - - - - - - - -
-
-
-

OPNFV Testing Working group

-
-
-

Follow

- -
-
    -
  • © Untitled. All rights reserved
  • Design: HTML5 UP
    • -
-
-
- -
- - - - - - - - - - diff --git a/reporting/html/functest.html b/reporting/html/functest.html new file mode 100644 index 0000000..d5f78c5 --- /dev/null +++ b/reporting/html/functest.html @@ -0,0 +1,108 @@ + + + + + Phantom by HTML5 UP + + + + + + +
+ + + + + + + + + + +
+
+
+

OPNFV Testing Working group

+
+
+

Follow

+ +
+
    +
  • © Untitled. All rights reserved
  • Design: HTML5 UP
    • +
+
+
+ +
+ + + + + + + + + + diff --git a/reporting/html/index.html b/reporting/html/index.html index 6bf0408..858ac47 100644 --- a/reporting/html/index.html +++ b/reporting/html/index.html @@ -43,29 +43,7 @@

OPNFV Testing group reporting

- - -
+
diff --git a/reporting/html/master.html b/reporting/html/master.html index 312e8e6..5d4f916 100644 --- a/reporting/html/master.html +++ b/reporting/html/master.html @@ -58,7 +58,7 @@ - +

Functest

Functional testing

diff --git a/reporting/reporting/functest/reporting-tempest.py b/reporting/reporting/functest/reporting-tempest.py index d78d9a1..b82f96c 100755 --- a/reporting/reporting/functest/reporting-tempest.py +++ b/reporting/reporting/functest/reporting-tempest.py @@ -83,8 +83,16 @@ for version in rp_utils.get_config('general.versions'): # retrieve results # **************** - nb_tests_run = result['details']['tests'] - nb_tests_failed = result['details']['failures'] + try: + nb_tests_run = result['details']['success_number'] + nb_tests_failed = result['details']['failures_number'] + except KeyError: + try: + nb_tests_run = result['details']['tests'] + nb_tests_failed = result['details']['failures'] + except KeyError: + logger.error("Impossible to retrieve results") + logger.debug("nb_tests_run= %s", nb_tests_run) logger.debug("nb_tests_failed= %s", nb_tests_failed) @@ -140,12 +148,14 @@ for version in rp_utils.get_config('general.versions'): # Error management # **************** try: - errors = result['details']['errors'] - logger.info("errors: %s", errors) - result['errors'] = errors - except Exception: # pylint: disable=broad-except - logger.error("Error field not present (Brahamputra runs?)") - + errors = result['details']['failures'] + except KeyError: + try: + errors = result['details']['errors'] + except KeyError: + logger.error("Error field not present (old runs?)") + logger.info("errors: %s", errors) + result['errors'] = errors templateLoader = jinja2.FileSystemLoader(".") templateEnv = jinja2.Environment(loader=templateLoader, autoescape=True) diff --git a/reporting/reporting/functest/reporting-vims.py b/reporting/reporting/functest/reporting-vims.py index 3b25e91..bc9308c 100755 --- a/reporting/reporting/functest/reporting-vims.py +++ b/reporting/reporting/functest/reporting-vims.py @@ -120,7 +120,7 @@ for version in VERSIONS: LOGGER.debug("vIMS deployment: %ss", res_vnf) LOGGER.debug("VNF testing: %ss", res_test_vnf) LOGGER.debug("VNF testing results: %s", format_result) - except Exception as err: # pylint: disable=broad-except + except KeyError as err: # pylint: disable=broad-except LOGGER.error("Uncomplete data %s", err) LOGGER.debug("----------------------------------------") -- cgit 1.2.3-korg