Merge "Update reporting page for Danube"

author: Morgan Richomme <morgan.richomme@orange.com> 2017-03-15 07:53:43 +0000
committer: Gerrit Code Review <gerrit@opnfv.org> 2017-03-15 07:53:43 +0000
commit: 2c4835306a6bd3dc831df4f02e2e7e8bd8e46ada (patch)
tree: 2333ccb49aea7b31bae3473bf8ba23117b3bb156 /utils
parent: d08d2aa2484626b66bd3d904d67a653f7683f6b4 (diff)
parent: 7060debf7f1b5280239eb0fbf395052b1f1343e3 (diff)
9 files changed, 635 insertions, 364 deletions
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 @@
-<!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>Danube reporting (Master)</h1>
-							</header>
-							<section class="tiles">
-								<article class="style3">
-									<span class="image">
-										<img src="img/functest.jpg" alt="" />
-									</span>
-									<a href="functest-master.html">
-										<h2>Functest</h2>
-										<div class="content">
-											<p>Functional testing</p>
-										</div>
-									</a>
-								</article>
-								<article class="style2">
-									<span class="image">
-										<img src="img/yardstick.jpg" alt="" />
-									</span>
-									<a href="master/yardstick/status-apex.html">
-										<h2>Yardstick</h2>
-										<div class="content">
-											<p>Qualification and performance testing</p>
-										</div>
-									</a>
-								</article>
-								<article class="style4">
-									<span class="image">
-										<img src="img/storperf.jpg" alt="" />
-									</span>
-									<a href="master/storperf/status-apex.html">
-										<h2>Storperf</h2>
-										<div class="content">
-											<p>Storage testing</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>
+<!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>Danube reporting</h1>
+							</header>
+							<section class="tiles">
+								<article class="style3">
+									<span class="image">
+										<img src="img/functest.jpg" alt="" />
+									</span>
+									<a href="functest-danube.html">
+										<h2>Functest</h2>
+										<div class="content">
+											<p>Functional testing</p>
+										</div>
+									</a>
+								</article>
+								<article class="style2">
+									<span class="image">
+										<img src="img/yardstick.jpg" alt="" />
+									</span>
+									<a href="danube/yardstick/status-apex.html">
+										<h2>Yardstick</h2>
+										<div class="content">
+											<p>Qualification and performance testing</p>
+										</div>
+									</a>
+								</article>
+								<article class="style4">
+									<span class="image">
+										<img src="img/storperf.jpg" alt="" />
+									</span>
+									<a href="danube/storperf/status-apex.html">
+										<h2>Storperf</h2>
+										<div class="content">
+											<p>Storage testing</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/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 @@
+<!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/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 @@
-<!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/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/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/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>
+<!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/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 @@
-<!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>OPNFV reporting</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>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 released on the 22nd of September</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>Master</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>
+<!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>OPNFV reporting</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>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 released on the 22nd of September</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 planned on the 22nd of March</p>
+										</div>
+									</a>
+								</article>
+								<article class="style6">
+									<span class="image">
+										<img src="img/euphrates.jpg" alt="" />
+									</span>
+									<a href="master.html">
+										<h2>Euphrates</h2>
+										<div class="content">
+											<p>Master</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/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 @@
+<!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>Master reporting</h1>
+							</header>
+							<section class="tiles">
+								<article class="style3">
+									<span class="image">
+										<img src="img/functest.jpg" alt="" />
+									</span>
+									<a href="functest-master.html">
+										<h2>Functest</h2>
+										<div class="content">
+											<p>Functional testing</p>
+										</div>
+									</a>
+								</article>
+								<article class="style2">
+									<span class="image">
+										<img src="img/yardstick.jpg" alt="" />
+									</span>
+									<a href="master/yardstick/status-apex.html">
+										<h2>Yardstick</h2>
+										<div class="content">
+											<p>Qualification and performance testing</p>
+										</div>
+									</a>
+								</article>
+								<article class="style4">
+									<span class="image">
+										<img src="img/storperf.jpg" alt="" />
+									</span>
+									<a href="master/storperf/status-apex.html">
+										<h2>Storperf</h2>
+										<div class="content">
+											<p>Storage testing</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/utils/test/reporting/img/euphrates.jpg b/utils/test/reporting/img/euphrates.jpg
new file mode 100644
index 000000000..3625b50cb
--- /dev/null
+++ b/utils/test/reporting/img/euphrates.jpg
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
author	Morgan Richomme <morgan.richomme@orange.com>	2017-03-15 07:53:43 +0000
committer	Gerrit Code Review <gerrit@opnfv.org>	2017-03-15 07:53:43 +0000
commit	2c4835306a6bd3dc831df4f02e2e7e8bd8e46ada (patch)
tree	2333ccb49aea7b31bae3473bf8ba23117b3bb156 /utils
parent	d08d2aa2484626b66bd3d904d67a653f7683f6b4 (diff)
parent	7060debf7f1b5280239eb0fbf395052b1f1343e3 (diff)