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 <morgan.richomme@orange.com>

diff --git a/reporting/docker/reporting.sh b/reporting/docker/reporting.sh
index 9648ee0..ee9dccf 100755 (executable)
--- 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 (file)
--- a/reporting/html/colorado.html
+++ b/reporting/html/colorado.html
@@ -58,7 +58,7 @@
                                                                        <span class="image">\r
                                                                                <img src="img/projectIcon_functest_250x250.png" alt="" />\r
                                                                        </span>\r
-                                                                       <a href="functest-colorado.html">\r
+                                                                       <a href="colorado/functest/functest.html">\r
                                                                                <h2>Functest</h2>\r
                                                                                <div class="content">\r
                                                                                        <p>Functional testing</p>\r

diff --git a/reporting/html/danube.html b/reporting/html/danube.html
index e06d6e5..ae8a3ac 100644 (file)
--- a/reporting/html/danube.html
+++ b/reporting/html/danube.html
@@ -58,7 +58,7 @@
                                                                        <span class="image">
                                                                                <img src="img/projectIcon_functest_250x250.png" alt="" />
                                                                        </span>
-                                                                       <a href="functest-danube.html">
+                                                                       <a href="danube/functest/functest.html">
                                                                                <h2>Functest</h2>
                                                                                <div class="content">
                                                                                        <p>Functional testing</p>

diff --git a/reporting/html/euphrates.html b/reporting/html/euphrates.html
index 1828fc7..e357edc 100644 (file)
--- a/reporting/html/euphrates.html
+++ b/reporting/html/euphrates.html
@@ -42,7 +42,7 @@
                                                                        <span class="image">
                                                                                <img src="img/projectIcon_functest_250x250.png" alt="" />
                                                                        </span>
-                                                                       <a href="functest-euphrates.html">
+                                                                       <a href="euphrates/functest/functest.html">
                                                                                <h2>Functest</h2>
                                                                                <div class="content">
                                                                                        <p>Functional testing</p>

diff --git a/reporting/html/fraser.html b/reporting/html/fraser.html
index df97617..65b996c 100644 (file)
--- a/reporting/html/fraser.html
+++ b/reporting/html/fraser.html
@@ -42,7 +42,7 @@
                                                                        <span class="image">
                                                                                <img src="img/projectIcon_functest_250x250.png" alt="" />
                                                                        </span>
-                                                                       <a href="functest-fraser.html">
+                                                                       <a href="fraser/functest/functest.html">
                                                                                <h2>Functest</h2>
                                                                                <div class="content">
                                                                                        <p>Functional testing</p>

diff --git a/reporting/html/functest-colorado.html b/reporting/html/functest-colorado.html
deleted file mode 100644 (file)
index 2fc76d1..0000000
--- a/reporting/html/functest-colorado.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE HTML>\r
-<!--\r
-       Phantom by HTML5 UP\r
-       html5up.net | @ajlkn\r
-       Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)\r
--->\r
-<html>\r
-       <head>\r
-               <title>Phantom by HTML5 UP</title>\r
-               <meta charset="utf-8" />\r
-               <meta name="viewport" content="width=device-width, initial-scale=1" />\r
-               <!--[if lte IE 8]><script src="3rd_party/js/ie/html5shiv.js"></script><![endif]-->\r
-               <link rel="stylesheet" href="3rd_party/css/main.css" />\r
-               <!--[if lte IE 9]><link rel="stylesheet" href="3rd_party/css/ie9.css" /><![endif]-->\r
-               <!--[if lte IE 8]><link rel="stylesheet" href="3rd_party/css/ie8.css" /><![endif]-->\r
-       </head>\r
-       <body>\r
-               <!-- Wrapper -->\r
-                       <div id="wrapper">\r
-\r
-                               <!-- Header -->\r
-                                       <header id="header">\r
-                                               <div class="inner">\r
-\r
-                                                       <!-- Logo -->\r
-                                                               <a href="index.html" class="logo">\r
-                                                                       <span class="symbol"><img src="img/logo.svg" alt="" /></span><span class="title">Phantom</span>\r
-                                                               </a>\r
-\r
-                                                       <!-- Nav -->\r
-                                                       <!--    <nav>\r
-                                                                       <ul>\r
-                                                                               <li><a href="#menu">Menu</a></li>\r
-                                                                       </ul>\r
-                                                               </nav>\r
-                             --->\r
-                                               </div>\r
-                                       </header>\r
-\r
-                               <!-- Menu -->\r
-                               <!---   <nav id="menu">\r
-                                               <h2>Menu</h2>\r
-                                               <ul>\r
-                                                       <li><a href="index.html">Home</a></li>\r
-                                                       <li><a href="colorado.html">Colorado</a></li>\r
-                                                       <li><a href="danube.html">Danube</a></li>\r
-                                               </ul>\r
-                                       </nav>\r
-                --->\r
-                               <!-- Main -->\r
-                                       <div id="main">\r
-                                               <div class="inner">\r
-                                                       <header>\r
-                                                               <h1>Functest reporting</h1>\r
-                                                       </header>\r
-                                                       <section class="tiles">\r
-                                                               <article class="style5">\r
-                                                                       <span class="image">\r
-                                                                               <img src="img/pic05.jpg" alt="" />\r
-                                                                       </span>\r
-                                                                       <a href="colorado/functest/status-apex.html">\r
-                                                                               <h2>Status</h2>\r
-                                                                               <div class="content">\r
-                                                                                       <p>Scenario status</p>\r
-                                                                               </div>\r
-                                                                       </a>\r
-                                                               </article>\r
-                                                               <article class="style2">\r
-                                                                       <span class="image">\r
-                                                                               <img src="img/pic02.jpg" alt="" />\r
-                                                                       </span>\r
-                                                                       <a href="colorado/functest/vims-apex.html">\r
-                                                                               <h2>vIMS</h2>\r
-                                                                               <div class="content">\r
-                                                                                       <p>Virtual IMS</p>\r
-                                                                               </div>\r
-                                                                       </a>\r
-                                                               </article>\r
-                                                               <article class="style3">\r
-                                                                       <span class="image">\r
-                                                                               <img src="img/pic03.jpg" alt="" />\r
-                                                                       </span>\r
-                                                                       <a href="colorado/functest/tempest-apex.html">\r
-                                                                               <h2>Tempest</h2>\r
-                                                                               <div class="content">\r
-                                                                                       <p>Tempest OpenStack suite</p>\r
-                                                                               </div>\r
-                                                                       </a>\r
-                                                               </article>\r
-                                                       </section>\r
-                                               </div>\r
-                                       </div>\r
-\r
-                               <!-- Footer -->\r
-                                       <footer id="footer">\r
-                                               <div class="inner">\r
-                                                       <section>\r
-                                                               <h2>OPNFV Testing Working group</h2>\r
-                                                       </section>\r
-                                                       <section>\r
-                                                               <h2>Follow</h2>\r
-                                                               <ul class="icons">\r
-                                                                       <li><a href="https://twitter.com/opnfv" class="icon style2 fa-twitter"><span class="label">Twitter</span></a></li>\r
-                                                                       <li><a href="http://git.opnfv.org" class="icon style2 fa-github"><span class="label">GitHub</span></a></li>\r
-                                                                       <li><a href="mailto:test-wg@list.opnfv.org" class="icon style2 fa-envelope-o"><span class="label">Email</span></a></li>\r
-                                                               </ul>\r
-                                                       </section>\r
-                                                       <ul class="copyright">\r
-                                                               <li>&copy; Untitled. All rights reserved</li><li>Design: <a href="http://html5up.net">HTML5 UP</a></li>\r
-                                                       </ul>\r
-                                               </div>\r
-                                       </footer>\r
-\r
-                       </div>\r
-\r
-               <!-- Scripts -->\r
-                       <script src="3rd_party/js/jquery.min.js"></script>\r
-                       <script src="3rd_party/js/skel.min.js"></script>\r
-                       <script src="3rd_party/js/util.js"></script>\r
-                       <!--[if lte IE 8]><script src="3rd_party/js/ie/respond.min.js"></script><![endif]-->\r
-                       <script src="3rd_party/js/main.js"></script>\r
-\r
-       </body>\r
-</html>\r

diff --git a/reporting/html/functest-danube.html b/reporting/html/functest-danube.html
deleted file mode 100644 (file)
index ac99cb0..0000000
--- a/reporting/html/functest-danube.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-       Phantom by HTML5 UP
-       html5up.net | @ajlkn
-       Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
--->
-<html>
-       <head>
-               <title>Phantom by HTML5 UP</title>
-               <meta charset="utf-8" />
-               <meta name="viewport" content="width=device-width, initial-scale=1" />
-               <!--[if lte IE 8]><script src="3rd_party/js/ie/html5shiv.js"></script><![endif]-->
-               <link rel="stylesheet" href="3rd_party/css/main.css" />
-               <!--[if lte IE 9]><link rel="stylesheet" href="3rd_party/css/ie9.css" /><![endif]-->
-               <!--[if lte IE 8]><link rel="stylesheet" href="3rd_party/css/ie8.css" /><![endif]-->
-       </head>
-       <body>
-               <!-- Wrapper -->
-                       <div id="wrapper">
-
-                               <!-- Header -->
-                                       <header id="header">
-                                               <div class="inner">
-
-                                                       <!-- Logo -->
-                                                               <a href="index.html" class="logo">
-                                                                       <span class="symbol"><img src="img/logo.svg" alt="" /></span><span class="title">Phantom</span>
-                                                               </a>
-
-                                                       <!-- Nav -->
-                                                       <!--    <nav>
-                                                                       <ul>
-                                                                               <li><a href="#menu">Menu</a></li>
-                                                                       </ul>
-                                                               </nav>
-                             --->
-                                               </div>
-                                       </header>
-
-                               <!-- Menu -->
-                               <!---   <nav id="menu">
-                                               <h2>Menu</h2>
-                                               <ul>
-                                                       <li><a href="index.html">Home</a></li>
-                                                       <li><a href="colorado.html">Colorado</a></li>
-                                                       <li><a href="danube.html">Danube</a></li>
-                                               </ul>
-                                       </nav>
-                --->
-                               <!-- Main -->
-                                       <div id="main">
-                                               <div class="inner">
-                                                       <header>
-                                                               <h1>Functest reporting</h1>
-                                                       </header>
-                                                       <section class="tiles">
-                                                               <article class="style5">
-                                                                       <span class="image">
-                                                                               <img src="img/pic05.jpg" alt="" />
-                                                                       </span>
-                                                                       <a href="danube/functest/status-apex.html">
-                                                                               <h2>Status</h2>
-                                                                               <div class="content">
-                                                                                       <p>Scenario status</p>
-                                                                               </div>
-                                                                       </a>
-                                                               </article>
-                                                               <article class="style2">
-                                                                       <span class="image">
-                                                                               <img src="img/pic02.jpg" alt="" />
-                                                                       </span>
-                                                                       <a href="danube/functest/vims-apex.html">
-                                                                               <h2>vIMS</h2>
-                                                                               <div class="content">
-                                                                                       <p>Virtual IMS</p>
-                                                                               </div>
-                                                                       </a>
-                                                               </article>
-                                                               <article class="style3">
-                                                                       <span class="image">
-                                                                               <img src="img/pic03.jpg" alt="" />
-                                                                       </span>
-                                                                       <a href="danube/functest/tempest-apex.html">
-                                                                               <h2>Tempest</h2>
-                                                                               <div class="content">
-                                                                                       <p>Tempest OpenStack suite</p>
-                                                                               </div>
-                                                                       </a>
-                                                               </article>
-                                                       </section>
-                                               </div>
-                                       </div>
-
-                               <!-- Footer -->
-                                       <footer id="footer">
-                                               <div class="inner">
-                                                       <section>
-                                                               <h2>OPNFV Testing Working group</h2>
-                                                       </section>
-                                                       <section>
-                                                               <h2>Follow</h2>
-                                                               <ul class="icons">
-                                                                       <li><a href="https://twitter.com/opnfv" class="icon style2 fa-twitter"><span class="label">Twitter</span></a></li>
-                                                                       <li><a href="http://git.opnfv.org" class="icon style2 fa-github"><span class="label">GitHub</span></a></li>
-                                                                       <li><a href="mailto:test-wg@list.opnfv.org" class="icon style2 fa-envelope-o"><span class="label">Email</span></a></li>
-                                                               </ul>
-                                                       </section>
-                                                       <ul class="copyright">
-                                                               <li>&copy; Untitled. All rights reserved</li><li>Design: <a href="http://html5up.net">HTML5 UP</a></li>
-                                                       </ul>
-                                               </div>
-                                       </footer>
-
-                       </div>
-
-               <!-- Scripts -->
-                       <script src="3rd_party/js/jquery.min.js"></script>
-                       <script src="3rd_party/js/skel.min.js"></script>
-                       <script src="3rd_party/js/util.js"></script>
-                       <!--[if lte IE 8]><script src="3rd_party/js/ie/respond.min.js"></script><![endif]-->
-                       <script src="3rd_party/js/main.js"></script>
-
-       </body>
-</html>

diff --git a/reporting/html/functest-euphrates.html b/reporting/html/functest-euphrates.html
deleted file mode 100644 (file)
index c203e61..0000000
--- a/reporting/html/functest-euphrates.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-       Phantom by HTML5 UP
-       html5up.net | @ajlkn
-       Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
--->
-<html>
-       <head>
-               <title>Phantom by HTML5 UP</title>
-               <meta charset="utf-8" />
-               <meta name="viewport" content="width=device-width, initial-scale=1" />
-               <!--[if lte IE 8]><script src="3rd_party/js/ie/html5shiv.js"></script><![endif]-->
-               <link rel="stylesheet" href="3rd_party/css/main.css" />
-               <!--[if lte IE 9]><link rel="stylesheet" href="3rd_party/css/ie9.css" /><![endif]-->
-               <!--[if lte IE 8]><link rel="stylesheet" href="3rd_party/css/ie8.css" /><![endif]-->
-       </head>
-       <body>
-               <!-- Wrapper -->
-                       <div id="wrapper">
-
-                               <!-- Header -->
-                                       <header id="header">
-                                               <div class="inner">
-
-                                                       <!-- Logo -->
-                                                               <a href="index.html" class="logo">
-                                                                       <span class="symbol"><img src="img/logo.svg" alt="" /></span><span class="title">Phantom</span>
-                                                               </a>
-
-                                               </div>
-                                       </header>
-
-                               <!-- Menu -->
-
-                               <!-- Main -->
-                                       <div id="main">
-                                               <div class="inner">
-                                                       <header>
-                                                               <h1>Functest reporting</h1>
-                                                       </header>
-                                                       <section class="tiles">
-                                                               <article class="style5">
-                                                                       <span class="image">
-                                                                               <img src="img/pic05.jpg" alt="" />
-                                                                       </span>
-                                                                       <a href="euphrates/functest/status-apex.html">
-                                                                               <h2>Status</h2>
-                                                                               <div class="content">
-                                                                                       <p>Scenario status</p>
-                                                                               </div>
-                                                                       </a>
-                                                               </article>
-                                                               <article class="style2">
-                                                                       <span class="image">
-                                                                               <img src="img/pic02.jpg" alt="" />
-                                                                       </span>
-                                                                       <a href="euphrates/functest/vims-apex.html">
-                                                                               <h2>vIMS</h2>
-                                                                               <div class="content">
-                                                                                       <p>Virtual IMS</p>
-                                                                               </div>
-                                                                       </a>
-                                                               </article>
-                                                               <article class="style3">
-                                                                       <span class="image">
-                                                                               <img src="img/pic03.jpg" alt="" />
-                                                                       </span>
-                                                                       <a href="euphrates/functest/tempest-apex.html">
-                                                                               <h2>Tempest</h2>
-                                                                               <div class="content">
-                                                                                       <p>Tempest OpenStack suite</p>
-                                                                               </div>
-                                                                       </a>
-                                                               </article>
-                                                       </section>
-                                               </div>
-                                       </div>
-
-                               <!-- Footer -->
-                                       <footer id="footer">
-                                               <div class="inner">
-                                                       <section>
-                                                               <h2>OPNFV Testing Working group</h2>
-                                                       </section>
-                                                       <section>
-                                                               <h2>Follow</h2>
-                                                               <ul class="icons">
-                                                                       <li><a href="https://twitter.com/opnfv" class="icon style2 fa-twitter"><span class="label">Twitter</span></a></li>
-                                                                       <li><a href="http://git.opnfv.org" class="icon style2 fa-github"><span class="label">GitHub</span></a></li>
-                                                                       <li><a href="mailto:test-wg@list.opnfv.org" class="icon style2 fa-envelope-o"><span class="label">Email</span></a></li>
-                                                               </ul>
-                                                       </section>
-                                                       <ul class="copyright">
-                                                               <li>&copy; Untitled. All rights reserved</li><li>Design: <a href="http://html5up.net">HTML5 UP</a></li>
-                                                       </ul>
-                                               </div>
-                                       </footer>
-
-                       </div>
-
-               <!-- Scripts -->
-                       <script src="3rd_party/js/jquery.min.js"></script>
-                       <script src="3rd_party/js/skel.min.js"></script>
-                       <script src="3rd_party/js/util.js"></script>
-                       <!--[if lte IE 8]><script src="3rd_party/js/ie/respond.min.js"></script><![endif]-->
-                       <script src="3rd_party/js/main.js"></script>
-
-       </body>
-</html>

diff --git a/reporting/html/functest-master.html b/reporting/html/functest-master.html
deleted file mode 100644 (file)
index 4b1f763..0000000
--- a/reporting/html/functest-master.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-       Phantom by HTML5 UP
-       html5up.net | @ajlkn
-       Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
--->
-<html>
-       <head>
-               <title>Phantom by HTML5 UP</title>
-               <meta charset="utf-8" />
-               <meta name="viewport" content="width=device-width, initial-scale=1" />
-               <!--[if lte IE 8]><script src="3rd_party/js/ie/html5shiv.js"></script><![endif]-->
-               <link rel="stylesheet" href="3rd_party/css/main.css" />
-               <!--[if lte IE 9]><link rel="stylesheet" href="3rd_party/css/ie9.css" /><![endif]-->
-               <!--[if lte IE 8]><link rel="stylesheet" href="3rd_party/css/ie8.css" /><![endif]-->
-       </head>
-       <body>
-               <!-- Wrapper -->
-                       <div id="wrapper">
-
-                               <!-- Header -->
-                                       <header id="header">
-                                               <div class="inner">
-
-                                                       <!-- Logo -->
-                                                               <a href="index.html" class="logo">
-                                                                       <span class="symbol"><img src="img/logo.svg" alt="" /></span><span class="title">Phantom</span>
-                                                               </a>
-
-                                                       <!-- Nav -->
-                                                       <!--    <nav>
-                                                                       <ul>
-                                                                               <li><a href="#menu">Menu</a></li>
-                                                                       </ul>
-                                                               </nav>
-                             --->
-                                               </div>
-                                       </header>
-
-                               <!-- Menu -->
-                               <!---   <nav id="menu">
-                                               <h2>Menu</h2>
-                                               <ul>
-                                                       <li><a href="index.html">Home</a></li>
-                                                       <li><a href="colorado.html">Colorado</a></li>
-                                                       <li><a href="danube.html">Danube</a></li>
-                                               </ul>
-                                       </nav>
-                --->
-                               <!-- Main -->
-                                       <div id="main">
-                                               <div class="inner">
-                                                       <header>
-                                                               <h1>Functest reporting</h1>
-                                                       </header>
-                                                       <section class="tiles">
-                                                               <article class="style5">
-                                                                       <span class="image">
-                                                                               <img src="img/pic05.jpg" alt="" />
-                                                                       </span>
-                                                                       <a href="master/functest/status-apex.html">
-                                                                               <h2>Status</h2>
-                                                                               <div class="content">
-                                                                                       <p>Scenario status</p>
-                                                                               </div>
-                                                                       </a>
-                                                               </article>
-                                                               <article class="style2">
-                                                                       <span class="image">
-                                                                               <img src="img/pic02.jpg" alt="" />
-                                                                       </span>
-                                                                       <a href="master/functest/vims-apex.html">
-                                                                               <h2>vIMS</h2>
-                                                                               <div class="content">
-                                                                                       <p>Virtual IMS</p>
-                                                                               </div>
-                                                                       </a>
-                                                               </article>
-                                                               <article class="style3">
-                                                                       <span class="image">
-                                                                               <img src="img/pic03.jpg" alt="" />
-                                                                       </span>
-                                                                       <a href="master/functest/tempest-apex.html">
-                                                                               <h2>Tempest</h2>
-                                                                               <div class="content">
-                                                                                       <p>Tempest OpenStack suite</p>
-                                                                               </div>
-                                                                       </a>
-                                                               </article>
-                                                       </section>
-                                               </div>
-                                       </div>
-
-                               <!-- Footer -->
-                                       <footer id="footer">
-                                               <div class="inner">
-                                                       <section>
-                                                               <h2>OPNFV Testing Working group</h2>
-                                                       </section>
-                                                       <section>
-                                                               <h2>Follow</h2>
-                                                               <ul class="icons">
-                                                                       <li><a href="https://twitter.com/opnfv" class="icon style2 fa-twitter"><span class="label">Twitter</span></a></li>
-                                                                       <li><a href="http://git.opnfv.org" class="icon style2 fa-github"><span class="label">GitHub</span></a></li>
-                                                                       <li><a href="mailto:test-wg@list.opnfv.org" class="icon style2 fa-envelope-o"><span class="label">Email</span></a></li>
-                                                               </ul>
-                                                       </section>
-                                                       <ul class="copyright">
-                                                               <li>&copy; Untitled. All rights reserved</li><li>Design: <a href="http://html5up.net">HTML5 UP</a></li>
-                                                       </ul>
-                                               </div>
-                                       </footer>
-
-                       </div>
-
-               <!-- Scripts -->
-                       <script src="3rd_party/js/jquery.min.js"></script>
-                       <script src="3rd_party/js/skel.min.js"></script>
-                       <script src="3rd_party/js/util.js"></script>
-                       <!--[if lte IE 8]><script src="3rd_party/js/ie/respond.min.js"></script><![endif]-->
-                       <script src="3rd_party/js/main.js"></script>
-
-       </body>
-</html>

diff --git a/reporting/html/functest-fraser.html b/reporting/html/functest.html
similarity index 72%
rename from reporting/html/functest-fraser.html
rename to reporting/html/functest.html
index 9b4c201..d5f78c5 100644 (file)
--- a/reporting/html/functest-fraser.html
+++ b/reporting/html/functest.html
@@ -9,10 +9,7 @@
                <title>Phantom by HTML5 UP</title>
                <meta charset="utf-8" />
                <meta name="viewport" content="width=device-width, initial-scale=1" />
-               <!--[if lte IE 8]><script src="3rd_party/js/ie/html5shiv.js"></script><![endif]-->
-               <link rel="stylesheet" href="3rd_party/css/main.css" />
-               <!--[if lte IE 9]><link rel="stylesheet" href="3rd_party/css/ie9.css" /><![endif]-->
-               <!--[if lte IE 8]><link rel="stylesheet" href="3rd_party/css/ie8.css" /><![endif]-->
+               <link rel="stylesheet" href="../../3rd_party/css/main.css" />
        </head>
        <body>
                <!-- Wrapper -->
@@ -24,7 +21,9 @@
 
                                                        <!-- Logo -->
                                                                <a href="index.html" class="logo">
-                                                                       <span class="symbol"><img src="img/logo.svg" alt="" /></span><span class="title">Phantom</span>
+                                                                       <span class="symbol"><img src="../../img/logo.svg" alt="" />
+                                                                       </span>
+                                                                       <span class="title">Functest</span>
                                                                </a>
 
                                                </div>
@@ -41,9 +40,9 @@
                                                        <section class="tiles">
                                                                <article class="style5">
                                                                        <span class="image">
-                                                                               <img src="img/pic05.jpg" alt="" />
+                                                                               <img src="../../img/pic05.jpg" alt="" />
                                                                        </span>
-                                                                       <a href="fraser/functest/status-apex.html">
+                                                                       <a href="status-apex.html">
                                                                                <h2>Status</h2>
                                                                                <div class="content">
                                                                                        <p>Scenario status</p>
@@ -52,9 +51,9 @@
                                                                </article>
                                                                <article class="style2">
                                                                        <span class="image">
-                                                                               <img src="img/pic02.jpg" alt="" />
+                                                                               <img src="../../img/pic02.jpg" alt="" />
                                                                        </span>
-                                                                       <a href="fraser/functest/vims-apex.html">
+                                                                       <a href="vims-apex.html">
                                                                                <h2>vIMS</h2>
                                                                                <div class="content">
                                                                                        <p>Virtual IMS</p>
@@ -63,9 +62,9 @@
                                                                </article>
                                                                <article class="style3">
                                                                        <span class="image">
-                                                                               <img src="img/pic03.jpg" alt="" />
+                                                                               <img src="../../img/pic03.jpg" alt="" />
                                                                        </span>
-                                                                       <a href="fraser/functest/tempest-apex.html">
+                                                                       <a href="tempest-apex.html">
                                                                                <h2>Tempest</h2>
                                                                                <div class="content">
                                                                                        <p>Tempest OpenStack suite</p>
@@ -99,11 +98,11 @@
                        </div>
 
                <!-- Scripts -->
-                       <script src="3rd_party/js/jquery.min.js"></script>
-                       <script src="3rd_party/js/skel.min.js"></script>
-                       <script src="3rd_party/js/util.js"></script>
+                       <script src="../../3rd_party/js/jquery.min.js"></script>
+                       <script src="../../3rd_party/js/skel.min.js"></script>
+                       <script src="../../3rd_party/js/util.js"></script>
                        <!--[if lte IE 8]><script src="3rd_party/js/ie/respond.min.js"></script><![endif]-->
-                       <script src="3rd_party/js/main.js"></script>
+                       <script src="../../3rd_party/js/main.js"></script>
 
        </body>
 </html>

diff --git a/reporting/html/index.html b/reporting/html/index.html
index 6bf0408..858ac47 100644 (file)
--- a/reporting/html/index.html
+++ b/reporting/html/index.html
@@ -43,29 +43,7 @@
                                                                <h1>OPNFV Testing group reporting</h1>
                                                        </header>
                                                        <section class="tiles">
-                                                               <article class="style3">
-                                                                       <span class="image">
-                                                                               <img src="img/colorado.jpg" alt="" />
-                                                                       </span>
-                                                                       <a href="colorado.html">
-                                                                               <h2>Colorado</h2>
-                                                                               <div class="content">
-                                                                                       <p>Colorado 1.0 (22/09/2016)</p>
-                                                                               </div>
-                                                                       </a>
-                                                               </article>
-                                                               <article class="style2">
-                                                                       <span class="image">
-                                                                               <img src="img/danube.jpg" alt="" />
-                                                                       </span>
-                                                                       <a href="danube.html">
-                                                                               <h2>Danube</h2>
-                                                                               <div class="content">
-                                                                                       <p>Danube 1.0 (22/03/2017)</p>
-                                                                               </div>
-                                                                       </a>
-                                                               </article>
-                                                               <article class="style4">
+                                                                       <article class="style4">
                                                                        <span class="image">
                                                                                <img src="img/euphrates.jpg" alt="" />
                                                                        </span>

diff --git a/reporting/html/master.html b/reporting/html/master.html
index 312e8e6..5d4f916 100644 (file)
--- a/reporting/html/master.html
+++ b/reporting/html/master.html
@@ -58,7 +58,7 @@
                                                                        <span class="image">
                                                                                <img src="img/projectIcon_functest_250x250.png" alt="" />
                                                                        </span>
-                                                                       <a href="functest-master.html">
+                                                                       <a href="master/functest/functest.html">
                                                                                <h2>Functest</h2>
                                                                                <div class="content">
                                                                                        <p>Functional testing</p>

diff --git a/reporting/reporting/functest/reporting-tempest.py b/reporting/reporting/functest/reporting-tempest.py
index d78d9a1..b82f96c 100755 (executable)
--- 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 (executable)
--- 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("----------------------------------------")