modify complete testing script

complete_testing/roles/complete_testing_install/templates/complete_testing.sh

@@ -4,26 +4,29 @@ time=`date +%Y%m%d%H%M`
 mkdir -p {{ complete_testing_temp_dir }} {{ complete_testing_dir }}
 #copy tpcc test result
 cd {{ tpcc_dir }} 
-`which cp` -a `ls -lrt |tail -n 1` {{ complete_testing_temp_dir }}
+`which cp` -a `ls -rt |tail -n 1` {{ complete_testing_temp_dir }}
 #copy sysbench test result
 cd {{ sysbench_dir }}
-`which cp` -a `ls -lrt|tail -n 4` {{ complete_testing_temp_dir }}
+`which cp` -a `ls -rt|tail -n 4` {{ complete_testing_temp_dir }}
 #copy fio test result
 cd {{ fio_dir }}
-`which cp` -a `ls -lrt|tail -n 1` {{ complete_testing_temp_dir }}
+`which cp` -a `ls -rt|tail -n 1` {{ complete_testing_temp_dir }}
 #grep tpcc test result
 tpcc_result=`tail -n 1 {{ complete_testing_temp_dir }}/*tpcc*  |awk '{print $1" "$2}'`
+echo "Testing_Host: {{ host }} Testing_Time: $time " >> {{ complete_testing_dir }}/{{ host }}_complete_testing_result-$time.log
 echo "Tpcc reslut is: $tpcc_result" >> {{ complete_testing_dir }}/{{ host }}_complete_testing_result-$time.log
 #grep sysbench test result
-cputest=$(grep taken {{ complete_testing_temp_dir }}/*sysbench_cputest*)
+cputest=$(grep taken {{ complete_testing_temp_dir }}/{{ host }}-sysbench_cputest-*)
 echo "Sysbench cpu_test result is: $cputest" >> {{ complete_testing_dir }}/{{ host }}_complete_testing_result-$time.log
-threads=$(grep taken {{ complete_testing_temp_dir }}/*sysbench_threads*)
+threads=$(grep taken {{ complete_testing_temp_dir }}/{{ host }}-sysbench_threads-*)
 echo "Sysbench sysbench_threads result is: $threads" >> {{ complete_testing_dir }}/{{ host }}_complete_testing_result-$time.log
-mutexxx=$(grep taken {{ complete_testing_temp_dir }}/*sysbench_mutexxx*)
+mutexxx=$(grep taken {{ complete_testing_temp_dir }}/{{ host}}-sysbench_mutexxx-*)
 echo "Sysbench sysbench_mutexxx result is: $mutexxx" >> {{ complete_testing_dir }}/{{ host }}_complete_testing_result-$time.log
-memory=$(grep taken {{ complete_testing_temp_dir }}/*sysbench_memory*)
-echo "Sysbench sysbench_memory result is: memory" >> {{ complete_testing_dir }}/{{ host }}_complete_testing_result-$time.log
+memory=$(grep taken {{ complete_testing_temp_dir }}/{{ host }}-sysbench_memory-*)
+echo "Sysbench sysbench_memory result is: $memory" >> {{ complete_testing_dir }}/{{ host }}_complete_testing_result-$time.log
 #grep fio test result
-fio=$(grep iops {{ complete_testing_temp_dir }}/*fio*)
-echo "Fio result is: $fio" >> {{ complete_testing_dir }}/{{ host }}_complete_testing_result-$time.log
+fio_read=$(awk '/iops/{print $5}' {{ complete_testing_temp_dir }}/{{ host }}-fio*|head -n1|awk -F ',' '{print "Random Read Is:"$1}')
+fio_write=$(awk '/iops/{print $4}' {{ complete_testing_temp_dir }}/{{ host }}-fio*|tail -n1|awk -F ',' '{print "Random Write Is:"$1}')
+echo "Fio Random Read result is: $fio_read" >> {{ complete_testing_dir }}/{{ host }}_complete_testing_result-$time.log
+echo "Fio Random write result is: $fio_write" >> {{ complete_testing_dir }}/{{ host }}_complete_testing_result-$time.log
 rm -rf {{ complete_testing_temp_dir }}