Merge branch 'master' of http://gitabc.xyqb.com/QA/qa-deploy-utils

qa_shell_script/jenkins/post_build_script.sh

 #!/bin/bash
 cd $JENKINS_HOME/jobs/$JOB_BASE_NAME/builds/${BUILD_NUMBER}
-res=`grep "2_get_code_by_name fail" log`
-if [ -n "$res" ];then
-	echo "2_get_code_by_name fail"
-	exit -1
-fi
-res=`grep "3_link_config_file_by_name fail" log`
-if [ -n "$res" ];then
-	echo "3_link_config_file_by_name fail"
-	exit -1
-fi
-res=`grep "4_build_by_name fail" log`
-if [ -n "$res" ];then
-	echo "4_build_by_name fail"
-	exit -1
-fi
-res=`grep "5_restart_by_name fail" log`
-if [ -n "$res" ];then
-	echo "5_restart_by_name fail"
+grep "_by_name fail" log
+if [ $? = 0 ];then
 	exit -1
 fi
+echo "post_build_script finish"

qa_shell_script/script_by_Contorller/Git_branch.sh

@@ -10,20 +10,20 @@ function Git_branch(){
 		set timeout 10
 			spawn ssh root@${ip}
 		expect \"]#\"
-			send \"for x in `find /home/quant_group/ -maxdepth 2 -name .git`;do cd $(dirname $x);echo $(dirname $x):;git branch | grep '*';done\r\"
+			send \"sh /home/qa-deploy-utils/qa_shell_script/script_by_Contorller/find_branch.sh\r\"
 		set timeout -1
 		expect \"]#\"
       send \"exit\r\"
 		expect eof;"
 	else
-		echo "查看服务$2的分支 $date"
+		echo "查看$2服务的分支 $date"
 	expect -c "
 		set timeout 10
 			spawn ssh root@${ip}
 		expect \"]#\"
 			send \"cd /home/quant_group/$2\r\"
 		expect \"]#\"
-			send \"git branch\r\"
+			send \"git branch | grep '*';git log -1 | grep Date;\r\"
 			set timeout -1
 		expect \"]#\"
       send \"exit\r\"

qa_shell_script/script_by_Contorller/find_branch.sh

+for x in `find /home/quant_group/ -maxdepth 2 -name .git`;do cd $(dirname $x);echo $(dirname $x):;git branch | grep '*';git log -1 | grep Date;done