X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=rubbos%2Frubbos_scripts%2F1-1-1%2Fscripts%2FCONTROL_rubbos_exec.sh;h=565a5b7066f1db033af11c1581f91efad126d1a0;hb=44fa06d65eafdcfce9671bdc09f2c8a6d7115982;hp=32163d4803cfe5b508617909b74fddcc8089a7c1;hpb=27a84e7905e66c005b02706ea3489576b5873c32;p=bottlenecks.git

diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh
index 32163d48..565a5b70 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh
@@ -17,9 +17,11 @@ ssh $BENCHMARK_HOST "
   mkdir -p $TMP_RESULTS_DIR_BASE/$RUBBOS_RESULTS_DIR_NAME
 "
 
-#TODO use for loop to genrate rubbos.properties file 200 ~ 1700
-for i in {2..2}
+# run test rubbos.properties from 200 to 3200
+for i in {2..7..5}
 do
+  echo "Start Browsing Only with rubbos.properties_$((100*i)) $(date)"
+
   ssh $BENCHMARK_HOST "
     source /bottlenecks/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh
     rm -f $RUBBOS_HOME/Client/rubbos.properties
@@ -38,8 +40,8 @@ do
   scp $OUTPUT_HOME/rubbos_conf/rubbos.properties $BENCHMARK_HOST:$RUBBOS_HOME/Client/rubbos.properties
   rm -rf $OUTPUT_HOME/rubbos_conf/rubbos.properties
 
-  #echo "Resetting all data"
-  #$OUTPUT_HOME/scripts/reset_all.sh
+  echo "Resetting all data"
+  $OUTPUT_HOME/scripts/reset_all.sh
 
   # Browsing Only
   echo "Start Browsing Only with rubbos.properties_$((100*i))"
@@ -91,13 +93,11 @@ do
     mv 20* $TMP_RESULTS_DIR_BASE/$RUBBOS_RESULTS_DIR_NAME/
   "
 
-  #$OUTPUT_HOME/scripts/stop_all.sh
-  #$OUTPUT_HOME/scripts/kill_all.sh
-  #sleep 15
-  echo "End Browsing Only with rubbos.properties_$((100*i))"
-
-  # Read/Write
+  $OUTPUT_HOME/scripts/stop_all.sh
+  $OUTPUT_HOME/scripts/kill_all.sh
+  sleep 15
 
+  echo "End Browsing Only with rubbos.properties_$((100*i)) $(date)"
 done
 
 echo "Processing the results..."
@@ -121,6 +121,16 @@ ls $RUBBOS_RESULTS_DIR_NAME.tgz
 tar zxf $RUBBOS_RESULTS_DIR_NAME.tgz
 ls $RUBBOS_RESULTS_DIR_NAME
 
+echo "Fetch POD env parameters"
+source /tmp/vm_dev_setup/hosts.conf
+sed -i -e "s/REPLACE_NODE_NAME/$NODE_NAME/g" \
+       -e "s/REPLACE_INSTALLER_TYPE/$INSTALLER_TYPE/g" \
+       -e "s/REPLACE_VERSION/$BOTTLENECKS_VERSION/g" \
+       -e "s#REPLACE_BOTTLENECKS_DB_TARGET#$BOTTLENECKS_DB_TARGET#g" \
+          $BOTTLENECKS_TOP/utils/dashboard/dashboard.yaml
+
+cat $BOTTLENECKS_TOP/utils/dashboard/dashboard.yaml
+
 python $BOTTLENECKS_TOP/utils/dashboard/process_data.py \
            $RUBBOS_RESULTS_DIR_BASE/$RUBBOS_RESULTS_DIR_NAME \
            $BOTTLENECKS_TOP/utils/dashboard/dashboard.yaml