From: Serena Feng <feng.xiaowei@zte.com.cn>
Date: Sat, 30 Sep 2017 07:21:27 +0000 (+0000)
Subject: Merge changes from topic 'qtip'
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=83659998110e6ffcf59ab90c58a29501a47a9e0d;hp=3cb1db94be6f1dda34d26679f2ed127552dd709d;p=releng.git

Merge changes from topic 'qtip'

* changes:
  Fix status reporting page
  Specify TESTAPI_URL in releng jobs
---

diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index 33f87beef..50b773ff8 100644
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -74,6 +74,9 @@
       - string:
           name: TEST_SUITE
           default: '{qpi}'
+      - string:
+          name: TESTAPI_URL
+          defaut: 'http://testresults.opnfv.org/test/api/v1'
     scm:
       - git-scm
 
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: