Merge "Reporting docker deployment improvement"

[releng.git] / utils / test / reporting / docker / reporting.sh

diff --git a/utils/test/reporting/docker/reporting.sh b/utils/test/reporting/docker/reporting.sh
index 78bcc4e..7fe97a8 100755 (executable)
--- a/utils/test/reporting/docker/reporting.sh
+++ b/utils/test/reporting/docker/reporting.sh
@@ -3,7 +3,7 @@
 export PYTHONPATH="${PYTHONPATH}:."
 export CONFIG_REPORTING_YAML=./reporting.yaml
 
-declare -a versions=(colorado master)
+declare -a versions=(danube master)
 declare -a projects=(functest storperf yardstick)
 
 project=$1
@@ -32,6 +32,22 @@ cp -Rf js display
 # yardstick |
 # storperf  |
 
+function report_project()
+{
+  project=$1
+  dir=$2
+  type=$3
+  echo "********************************"
+  echo " $project reporting "
+  echo "********************************"
+  python ./$dir/reporting-$type.py
+  if [ $? ]; then
+    echo "$project reporting $type...OK"
+  else
+    echo "$project reporting $type...KO"
+  fi
+}
+
 if [ -z "$1" ]; then
   echo "********************************"
   echo " Functest reporting "
@@ -60,6 +76,8 @@ if [ -z "$1" ]; then
   python ./storperf/reporting-status.py
   echo "Storperf reporting status...OK"
 
+  report_project "QTIP" "qtip" "status"
+
 else
   if [ -z "$2" ]; then
     reporting_type="status"
@@ -79,10 +97,6 @@ echo "daemon off;" >> /etc/nginx/nginx.conf
 # supervisor config
 cp /home/opnfv/utils/test/reporting/docker/supervisor.conf /etc/supervisor/conf.d/
 
-# build pages
-cd pages
 ln -s /usr/bin/nodejs /usr/bin/node
-npm install
-npm install -g grunt bower
-bower install --allow-root
-grunt build
+
+cd pages && /bin/bash angular.sh