Bug Fixes: remove Db name + path

[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 5d4ea11..1b1e4a8 100755 (executable)
--- a/utils/test/reporting/docker/reporting.sh
+++ b/utils/test/reporting/docker/reporting.sh
@@ -1,11 +1,10 @@
 #!/bin/bash
-cd ..
 
 export PYTHONPATH="${PYTHONPATH}:."
 export CONFIG_REPORTING_YAML=./reporting.yaml
 
-declare -a versions=(colorado master)
-declare -a projects=(functest yardstick)
+declare -a versions=(danube master)
+declare -a projects=(functest storperf yardstick)
 
 project=$1
 reporting_type=$2
@@ -20,7 +19,7 @@ do
 done
 
 # copy images, js, css, 3rd_party
-cp -Rf 3rd_party display  
+cp -Rf 3rd_party display
 cp -Rf css display
 cp -Rf html/* display
 cp -Rf img display
@@ -31,10 +30,11 @@ cp -Rf js display
 #   $1      |          $2
 # functest  | status, vims, tempest
 # yardstick |
+# storperf  |
 
 if [ -z "$1" ]; then
   echo "********************************"
-  echo " Functest reporting " 
+  echo " Functest reporting "
   echo "********************************"
   echo "reporting vIMS..."
   python ./functest/reporting-vims.py
@@ -49,17 +49,34 @@ if [ -z "$1" ]; then
   echo "Functest reporting status...OK"
 
   echo "********************************"
-  echo " Yardstick reporting " 
+  echo " Yardstick reporting "
   echo "********************************"
   python ./yardstick/reporting-status.py
   echo "Yardstick reporting status...OK"
+
+  echo "********************************"
+  echo " Storperf reporting "
+  echo "********************************"
+  python ./storperf/reporting-status.py
+  echo "Storperf reporting status...OK"
+
 else
   if [ -z "$2" ]; then
     reporting_type="status"
   fi
   echo "********************************"
-  echo " $project/$reporting_type reporting " 
+  echo " $project/$reporting_type reporting "
   echo "********************************"
   python ./$project/reporting-$reporting_type.py
 fi
+cp -r display /usr/share/nginx/html
+
+
+# nginx config
+cp /home/opnfv/utils/test/reporting/docker/nginx.conf /etc/nginx/conf.d/
+echo "daemon off;" >> /etc/nginx/nginx.conf
+
+# supervisor config
+cp /home/opnfv/utils/test/reporting/docker/supervisor.conf /etc/supervisor/conf.d/
 
+ln -s /usr/bin/nodejs /usr/bin/node