Merge "Adding fraser version in reporting"

author: Serena Feng <feng.xiaowei@zte.com.cn> 2018-04-09 01:13:18 +0000
committer: Gerrit Code Review <gerrit@opnfv.org> 2018-04-09 01:13:18 +0000
commit: 430546a1b9adfc48a1c77844f29c952859590449 (patch)
tree: 73c1b5bf4d9ff00754c944be4a4a0a0b440a7cb5
parent: b6657d736a34cc784fd014e9ef6832021b5fe016 (diff)
parent: 80e778047015ca643494f67b53589b27af13a4bd (diff)
7 files changed, 264 insertions, 3 deletions
diff --git a/reporting/docker/reporting.sh b/reporting/docker/reporting.sh
index 2cb438d..9648ee0 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=(euphrates danube master)
+declare -a versions=(fraser euphrates danube master)
 declare -a projects=(functest storperf yardstick qtip vsperf bottlenecks)
 
 project=$1
diff --git a/reporting/html/fraser.html b/reporting/html/fraser.html
new file mode 100644
index 0000000..df97617
--- /dev/null
+++ b/reporting/html/fraser.html
@@ -0,0 +1,141 @@
+<!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>Fraser reporting</h1>
+							</header>
+							<section class="tiles">
+								<article class="style3">
+									<span class="image">
+										<img src="img/projectIcon_functest_250x250.png" alt="" />
+									</span>
+									<a href="functest-fraser.html">
+										<h2>Functest</h2>
+										<div class="content">
+											<p>Functional testing</p>
+										</div>
+									</a>
+								</article>
+								<article class="style2">
+									<span class="image">
+										<img src="img/projectIcon_yardstick_250x250.png" alt="" />
+									</span>
+									<a href="fraser/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/projectIcon_storperf_250x250.png" alt="" />
+									</span>
+									<a href="fraser/storperf/status-apex.html">
+										<h2>Storperf</h2>
+										<div class="content">
+											<p>Storage testing</p>
+										</div>
+									</a>
+								</article>
+								<article class="style5">
+									<span class="image">
+										<img src="img/projectIcon_vsperf_250x250.png" alt="" />
+									</span>
+									<a href="fraser/vsperf/reporting.html">
+										<h2>Vsperf</h2>
+										<div class="content">
+											<p>Virtual switch testing</p>
+										</div>
+									</a>
+								</article>
+								<article class="style1">
+									<span class="image">
+										<img src="img/projectIcon_qtip_250x250.png" alt="" />
+									</span>
+									<a href="fraser/qtip/status-apex.html">
+										<h2>Qtip</h2>
+										<div class="content">
+											<p>Benchmark as a service</p>
+										</div>
+									</a>
+								</article>
+								<article class="style6">
+									<span class="image">
+										<img src="img/projectIcon_bottlenecks_250x250.png" alt="" />
+									</span>
+									<a href="fraser/bottlenecks/status-apex.html">
+										<h2>Bottlenecks</h2>
+										<div class="content">
+											<p>Bottleneck finder</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-fraser.html
new file mode 100644
index 0000000..9b4c201
--- /dev/null
+++ b/reporting/html/functest-fraser.html
@@ -0,0 +1,109 @@
+<!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="fraser/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="fraser/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="fraser/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/index.html b/reporting/html/index.html
index 22d7078..6bf0408 100644
--- a/reporting/html/index.html
+++ b/reporting/html/index.html
@@ -78,6 +78,17 @@
 								</article>
 								<article class="style6">
 									<span class="image">
+										<img src="img/fraser.jpg" alt="" />
+									</span>
+									<a href="fraser.html">
+										<h2>Fraser</h2>
+										<div class="content">
+											<p>Fraser (ETA 04/2018)</p>
+										</div>
+									</a>
+								</article>
+								<article class="style5">
+									<span class="image">
 										<img src="img/misc-npc-letterblock-m-800px.png" alt="" />
 									</span>
 									<a href="master.html">
diff --git a/reporting/img/fraser.jpg b/reporting/img/fraser.jpg
new file mode 100644
index 0000000..8bc6b51
--- /dev/null
+++ b/reporting/img/fraser.jpg
diff --git a/reporting/reporting/reporting.yaml b/reporting/reporting/reporting.yaml
index 8123d01..b2f7d07 100644
--- a/reporting/reporting/reporting.yaml
+++ b/reporting/reporting/reporting.yaml
@@ -9,7 +9,7 @@ general:
 
     versions:
         - master
-        - euphrates
+        - fraser
 
     log:
         log_file: reporting.log
diff --git a/reporting/reporting/vsperf/reporting-status.py b/reporting/reporting/vsperf/reporting-status.py
index b307ef0..f1a437f 100644
--- a/reporting/reporting/vsperf/reporting-status.py
+++ b/reporting/reporting/vsperf/reporting-status.py
@@ -127,7 +127,7 @@ def main():
                                         period=50)
     version_data = _get_version_data(data['vsperf'])
 
-    for version in {'master', 'danube', 'euphrates'}:
+    for version in {'master', 'danube', 'euphrates', 'fraser'}:
         _generate_reporting(version, version_data.get(version, []))
 
     LOG.info("End")
author	Serena Feng <feng.xiaowei@zte.com.cn>	2018-04-09 01:13:18 +0000
committer	Gerrit Code Review <gerrit@opnfv.org>	2018-04-09 01:13:18 +0000
commit	430546a1b9adfc48a1c77844f29c952859590449 (patch)
tree	73c1b5bf4d9ff00754c944be4a4a0a0b440a7cb5
parent	b6657d736a34cc784fd014e9ef6832021b5fe016 (diff)
parent	80e778047015ca643494f67b53589b27af13a4bd (diff)