update

qa_shell_script/deploy_project_by_type.sh

@@ -19,19 +19,9 @@ mkfifo /tmp/$tempfifo
 exec 1000<>/tmp/$tempfifo
 rm -rf /tmp/$tempfifo
 
-echo "********"
-if [ "$project_type" = "all" ]
-then
-	projects=(`node $config_server/get_project_config.js  -type ui -attr name`)
-        echo ${#projects[@]}"个ui项目:"  ${projects[@]}
-	projects=(`node $config_server/get_project_config.js  -type java -attr name`)
-        echo ${#projects[@]}"个java项目:"  ${projects[@]}
-	projects=(`node $config_server/get_project_config.js  -type node -attr name`)
-        echo ${#projects[@]}"个node项目:"  ${projects[@]}
-	projects=(`node $config_server/get_project_config.js  -type python -attr name`)
-        echo ${#projects[@]}"个python项目:"  ${projects[@]}
-else
-	for ((i=1; i<=6; i++))
+function deploy()
+{
+	for ((i=1; i<=4; i++))
 	do
 		echo >&1000
 	done
@@ -42,7 +32,7 @@ else
 	do
 		read -u1000
 		{
-			sh /home/qa-deploy-utils/qa_shell_script/2_get_code_by_name.sh $project_name "$branch_name" $4
+			sh /home/qa-deploy-utils/qa_shell_script/2_get_code_by_name.sh $project_name "$branch_name" $ip
 			if [ $? = 0 ]; then
 				echo "--- $project_name 2_get_code_by_name ok ---"
 			else
@@ -51,7 +41,7 @@ else
 				exit -1
 			fi
  
-			sh /home/qa-deploy-utils/qa_shell_script/3_link_config_file_by_name.sh $project_name $public_ip $4
+			sh /home/qa-deploy-utils/qa_shell_script/3_link_config_file_by_name.sh $project_name $public_ip $ip
 			if [ $? = 0 ]; then
 				echo "--- $project_name 3_link_config_file_by_name ok ---"
 			else
@@ -60,7 +50,7 @@ else
 				exit -1
 			fi
 
-			sh /home/qa-deploy-utils/qa_shell_script/4_build_by_name.sh $project_name $public_ip $4
+			sh /home/qa-deploy-utils/qa_shell_script/4_build_by_name.sh $project_name $public_ip $ip
 			if [ $? = 0 ]; then
 				echo "--- $project_name 4_build_by_name ok ---"
 			else
@@ -69,7 +59,7 @@ else
 				exit -1
 			fi
 
-			sh /home/qa-deploy-utils/qa_shell_script/5_restart_by_name.sh $project_name $public_ip $4
+			sh /home/qa-deploy-utils/qa_shell_script/5_restart_by_name.sh $project_name $public_ip $ip
 			if [ $? = 0 ]; then
 				echo "--- $project_name 5_restart_by_name ok ---"
 			else
@@ -81,14 +71,22 @@ else
 		}&
 	done
 	wait
-fi
-#echo "********"
-#echo "********sh 2_get_code_by_type.sh $project_type $branch_name $ip********"
-#sh 2_get_code_by_type.sh $project_type $branch_name $ip
-#echo "********sh 3_link_config_file_by_type.sh $project_type $public_ip $ip********"
-#sh 3_link_config_file_by_type.sh $project_type $public_ip $ip
-#echo "********sh 4_build_by_type.sh $project_type $public_ip $ip********-"
-#sh 4_build_by_type.sh $project_type $public_ip $ip
-#echo "********sh 5_restart_by_type.sh $project_type $public_ip $ip********"
-#sh 5_restart_by_type.sh $project_type $public_ip $ip
+}
 
+if [ "$project_type" = "all" ]
+then
+	#projects=(`node $config_server/get_project_config.js  -type ui -attr name`)
+        #echo ${#projects[@]}"个ui项目:"  ${projects[@]}
+	#projects=(`node $config_server/get_project_config.js  -type java -attr name`)
+        #echo ${#projects[@]}"个java项目:"  ${projects[@]}
+	#projects=(`node $config_server/get_project_config.js  -type node -attr name`)
+        #echo ${#projects[@]}"个node项目:"  ${projects[@]}
+	#projects=(`node $config_server/get_project_config.js  -type python -attr name`)
+        #echo ${#projects[@]}"个python项目:"  ${projects[@]}
+	deploy node
+	deploy ui
+	deploy java
+	deploy python
+else
+	deploy $project_type
+fi