summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYujun Zhang <zhang.yujunz@zte.com.cn>2017-09-30 14:42:53 +0800
committerYujun Zhang <zhang.yujunz@zte.com.cn>2017-09-30 15:16:06 +0800
commite0a084d4c7f22dc54e65fad871772aaaf14c3edc (patch)
tree4bc24e6b5dbb5e55c9ed1da5b62f6170445d8e75
parentd1711875d0da2653662a64425c26dda7430afacb (diff)
Fix status reporting page
- use data in last 10 days instead of 1 day - hide installers without any data - remove redundant qtip reporting Change-Id: If73a439572b6a1cf09c7d34f643fb14be82196ca Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
-rwxr-xr-xutils/test/reporting/docker/reporting.sh2
-rw-r--r--utils/test/reporting/reporting/qtip/reporting-status.py19
-rw-r--r--utils/test/reporting/reporting/qtip/template/index-status-tmpl.html8
-rw-r--r--utils/test/reporting/reporting/reporting.yaml2
4 files changed, 12 insertions, 19 deletions
diff --git a/utils/test/reporting/docker/reporting.sh b/utils/test/reporting/docker/reporting.sh
index 25d3ef117..2cb438d00 100755
--- a/utils/test/reporting/docker/reporting.sh
+++ b/utils/test/reporting/docker/reporting.sh
@@ -59,8 +59,6 @@ if [ -z "$1" ]; then
report_project $i $i "status"
sleep 5
done
- report_project "QTIP" "qtip" "status"
-
echo "Functest reporting vIMS..."
report_project "functest" "functest" "vims"
diff --git a/utils/test/reporting/reporting/qtip/reporting-status.py b/utils/test/reporting/reporting/qtip/reporting-status.py
index 56f9e0aee..524338ca0 100644
--- a/utils/test/reporting/reporting/qtip/reporting-status.py
+++ b/utils/test/reporting/reporting/qtip/reporting-status.py
@@ -45,27 +45,22 @@ def prepare_profile_file(version):
def profile_results(results, installer, profile_fd):
result_criterias = {}
for s_p, s_p_result in results.iteritems():
- ten_criteria = len(s_p_result)
- ten_score = sum(s_p_result)
+ avg_last_ten = sum([int(s) for s in s_p_result]) / len(s_p_result)
LASTEST_TESTS = rp_utils.get_config(
'general.nb_iteration_tests_success_criteria')
- four_result = s_p_result[:LASTEST_TESTS]
- four_criteria = len(four_result)
- four_score = sum(four_result)
-
- s_four_score = str(four_score / four_criteria)
- s_ten_score = str(ten_score / ten_criteria)
+ last_four = s_p_result[-LASTEST_TESTS:]
+ avg_last_four = sum([int(s) for s in last_four]) / len(last_four)
info = '{},{},{},{},{}\n'.format(reportingDate,
s_p,
installer,
- s_ten_score,
- s_four_score)
+ '',
+ avg_last_four)
profile_fd.write(info)
result_criterias[s_p] = sr.ScenarioResult('OK',
- s_four_score,
- s_ten_score,
+ avg_last_four,
+ avg_last_ten,
'100')
logger.info("--------------------------")
diff --git a/utils/test/reporting/reporting/qtip/template/index-status-tmpl.html b/utils/test/reporting/reporting/qtip/template/index-status-tmpl.html
index 92f3395dc..da8424a22 100644
--- a/utils/test/reporting/reporting/qtip/template/index-status-tmpl.html
+++ b/utils/test/reporting/reporting/qtip/template/index-status-tmpl.html
@@ -47,10 +47,10 @@
<ul class="nav nav-justified">
<li class="active"><a href="http://testresults.opnfv.org/reporting/index.html">Home</a></li>
<li><a href="status-apex.html">Apex</a></li>
- <li><a href="status-compass.html">Compass</a></li>
- <li><a href="status-daisy.html">Daisy</a></li>
- <li><a href="status-fuel.html">Fuel</a></li>
- <li><a href="status-joid.html">Joid</a></li>
+ <!--<li><a href="status-compass.html">Compass</a></li>-->
+ <!--<li><a href="status-daisy.html">Daisy</a></li>-->
+ <!--<li><a href="status-fuel.html">Fuel</a></li>-->
+ <!--<li><a href="status-joid.html">Joid</a></li>-->
</ul>
</nav>
</div>
diff --git a/utils/test/reporting/reporting/reporting.yaml b/utils/test/reporting/reporting/reporting.yaml
index dae832ab5..2a4aa492c 100644
--- a/utils/test/reporting/reporting/reporting.yaml
+++ b/utils/test/reporting/reporting/reporting.yaml
@@ -56,7 +56,7 @@ storperf:
qtip:
log_level: ERROR
- period: 1
+ period: 10
bottlenecks:
test_list: