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

qa_shell_script/app/XyqbAndroidBuild.sh

 #!/bin/bash -ilex
 source /etc/profile
+source ~/.bash_profile
 project_path=/home/quant_group/jenkins/workspace/XyqbAndroidBuild
 StroeApk_path=${project_path}/apk
 BuildGradle_file=${project_path}/app/build.gradle
@@ -7,7 +8,7 @@ BuildApk_path=${project_path}/build/archives
 SourceMarkes_flavors=/home/qa-deploy-utils/qa_shell_script/app/markets.txt
 branch_name=$1
 product_flavors=$2
-
+build_time=$3
 
 cd ${project_path}
 function get_code()
@@ -51,7 +52,7 @@ function build_android()
         echo "构建所有渠道包"
     fi
     rm -rf ${BuildApk_path}/*
-    rm -rf ${project_path}/apk/*
+    #rm -rf ${project_path}/apk/*
     cd ${project_path}
     pwd
     echo "开始使用gradle进行编译该版本的代码"
@@ -65,10 +66,11 @@ function build_android()
         #else
         #    ApkFile="`find ${BuildApk_path} -name "*ceshi.apk"`"
         #fi
-	ApkFile="`find ${BuildApk_path} -name "*${product_flavors}.apk"`"
+	ApkFile=`find ${BuildApk_path} -name "*${product_flavors}*.apk"`
         echo "apk名称是：${ApkFile}"
         echo "当前路径 `pwd`"
-        cp -r ${ApkFile} ${StroeApk_path}/${branch_name}_${product_flavors}.apk
+        #mv ${ApkFile} ${StroeApk_path}/${branch_name}_${product_flavors}.apk
+        mv ${ApkFile} ${branch_name}_${product_flavors}_${build_time}.apk
     else
         echo "构建失败，请联系管理员查看".
         exit -1
@@ -78,9 +80,10 @@ function build_android()
 function upload_apk()
 {
    echo "apk正在上传到蒲公英，请等待......"
-   cd ${StroeApk_path}
+   #cd ${StroeApk_path}
    echo "当前上传apk包的路径是 `pwd`"
-   curl -F "file=@${branch_name}_${product_flavors}.apk" -F "uKey=13d17385c02ea9ea994d0c985d87ff32" -F "_api_key=5b09af98d5a8ff43f2f39935fa6bfbc1" https://qiniu-storage.pgyer.com/apiv1/app/upload
+   #curl -F "file=@${branch_name}_${product_flavors}_${build_time}.apk" -F "uKey=13d17385c02ea9ea994d0c985d87ff32" -F "_api_key=5b09af98d5a8ff43f2f39935fa6bfbc1" https://qiniu-storage.pgyer.com/apiv1/app/upload
+   curl -F "file=@${branch_name}_${product_flavors}_${build_time}.apk" -F "uKey=13d17385c02ea9ea994d0c985d87ff32" -F "_api_key=5b09af98d5a8ff43f2f39935fa6bfbc1" https://qiniu-storage.pgyer.com/apiv1/app/upload
    if [ $? != 0 ]; then
         echo "上传失败，请联系管理员查看"
    fi

qa_shell_script/remote_excute_new.sh

@@ -14,6 +14,16 @@ branch_name : ${branch_name}
 project_type : ${project_type}
 public_ip : ${public_ip}
 "
+<<<<<<< HEAD
+sshpass -p '!QAZ2wsx' ssh root@${ip}
+ifconfig
+if [ -n "$project_name"  ] && [  -n "$branch_name" ]; then
+	sshpass -p '!QAZ2wsx' ssh root@${ip} "cd /home/qa-deploy-utils/qa_shell_script"
+	sshpass -p '!QAZ2wsx' ssh root@${ip} "sh /home/qa-deploy-utils/qa_shell_script/deploy_project_by_name.sh $project_name $branch_name $public_ip"
+else
+	sshpass -p '!QAZ2wsx' ssh root@${ip} "cd /home/qa-deploy-utils/qa_shell_script"
+	sshpass -p '!QAZ2wsx' ssh root@${ip} "sh /home/qa-deploy-utils/qa_shell_script/deploy_project_by_type.sh $project_type $branch_name $public_ip"
+=======
 
 sshpass -p '!QAZ2wsx' ssh root@${ip} "ifconfig"
 if [ -n "$project_name"  ] && [  -n "$branch_name" ]; then
@@ -24,5 +34,6 @@ else
 	sshpass -p '!QAZ2wsx' ssh root@${ip}
 	cd /home/qa-deploy-utils/qa_shell_script
 	sh /home/qa-deploy-utils/qa_shell_script/deploy_project_by_type.sh $project_type $branch_name $public_ip
+>>>>>>> c37e484565713dd4f2e2ef060cef9d7351645849
 fi