Commit bc2b6d3a authored by qa_quantgroup's avatar qa_quantgroup

update

parent 78221b8c
......@@ -6,6 +6,11 @@ config_server="$pwd_path/config_server"
project_path=`cat $config_server/project_path.sh`
config_path=`cat $config_server/config_path.sh`
if [ -z "$project_name" ];then
echo "清输入项目名称"
exit -1
fi
cd $project_path
project_folder=`find ./ -maxdepth 1 -name "$project_name"`
if [ -n "$project_folder" ];then
......
......@@ -25,13 +25,13 @@ then
then
if $is_public_ip && [ -n "$is_public_ip" ]
then
echo "-------link-$project--$config_path/public/$project_type/$project.*----/home/quant_group/$project/$file "
echo "link-$project $config_path/public/$project_type/$project.* /home/quant_group/$project/$file "
cp -r $config_path/public/$project_type/${project}.* /home/quant_group/${project}/$file
if [ $? != 0 ];then
exit -1
fi
else
echo "-------link-$project--$config_path/$project_type/$project.*----/home/quant_group/$project/$file "
echo "link $project $config_path/$project_type/$project.* /home/quant_group/$project/$file "
cp -r $config_path/$project_type/${project}.* /home/quant_group/${project}/$file
if [ $? != 0 ];then
exit -1
......@@ -58,7 +58,7 @@ then
if [ "$project" = "xyqb-mall" ]
then
rm -rf /home/quant_group/xyqb-mall/baitiao
echo "~~ln -s $config_path/pem_file /home/quant_group/xyqb-mall/baitiao"
echo "ln -s $config_path/pem_file /home/quant_group/xyqb-mall/baitiao"
ln -s $config_path/pem_file /home/quant_group/xyqb-mall/baitiao
fi
fi
......
#!/bin/bash
project_name=$1
is_public_ip=$2
ip=$3
pwd_path="/home/qa-deploy-utils/qa_shell_script"
config_server="$pwd_path/config_server"
project_path=`cat $config_server/project_path.sh`
project_type=`node $config_server/get_project_config.js -name $project_name -attr type`
config_path=`cat $config_server/config_path.sh`
if [ -z "$project_name" ];then
echo "清输入项目名称"
exit -1
fi
profile=test
host=`/sbin/ifconfig -a|grep inet|grep -v 127.0.0.1|grep -v inet6|awk '{print $2}'|tr -d "addr:"`
echo "host=$host"
#echo "host=$host"
hosts=(${host//\./ })
suffix=${hosts[3]}
if [ "$project_type" = "java" ]; then
sh $pwd_path/base_script/buildJava.sh $project_name $config_server $project_path
sh $pwd_path/base_script/buildJava.sh $project_name $config_server $project_path $ip
# buildJavaProject $project_name $3
elif [ "$project_type" = "ui" ]; then
sh $pwd_path/base_script/buildUi.sh $project_name $config_server $project_path
sh $pwd_path/base_script/buildUi.sh $project_name $config_server $project_path $ip
# buildUiProject $project_name $3
elif [ "$project_type" = "node" ]; then
sh $pwd_path/base_script/buildNode.sh $project_name $config_server $project_path
sh $pwd_path/base_script/buildNode.sh $project_name $config_server $project_path $ip
# buildNodeProject $project_name $3
elif [ "$project_type" = "python" ]; then
sh $pwd_path/base_script/buildPython.sh $project_name $config_server $project_path
sh $pwd_path/base_script/buildPython.sh $project_name $config_server $project_path $ip
# buildPythonProject $project_name $3
fi
......@@ -7,7 +7,12 @@ config_server="$pwd_path/config_server"
project_path=`cat $config_server/project_path.sh`
config_path=`cat $config_server/config_path.sh`
trap "exec 1000>&-;exec 1000<&-;exit 0" 2
tempfifo=$$.fifo
echo "mkfifo /tmp/$tempfifo"
mkfifo /tmp/$tempfifo
exec 1000<>/tmp/$tempfifo
rm -rf /tmp/$tempfifo
function buildNginx()
{
......@@ -17,27 +22,54 @@ function buildNginx()
}
if [ "$project_type" = "java" ]; then
for ((i=1; i<=4; i++))
do
echo >&1000
done
java_projects=(`node $config_server/get_project_config.js -type java -attr name`)
for project_name in ${java_projects[@]}
do
sh $pwd_path/base_script/buildJava.sh $project_name $config_server $project_path
# buildJavaProject $project
read -u1000
{
sh $pwd_path/base_script/buildJava.sh $project_name $config_server $project_path
# buildJavaProject $project
echo >&1000
}&
done
wait
elif [ "$project_type" = "ui" ]; then
for ((i=1; i<=8; i++))
do
echo >&1000
done
ui_projects=(`node $config_server/get_project_config.js -type ui -attr name`)
for project_name in ${ui_projects[@]}
do
sh $pwd_path/base_script/buildUi.sh $project_name $config_server $project_path
# buildUiProject $project
read -u1000
{
sh $pwd_path/base_script/buildUi.sh $project_name $config_server $project_path
# buildUiProject $project
echo >&1000
}&
done
wait
buildNginx
elif [ "$project_type" = "node" ]; then
for ((i=1; i<=8; i++))
do
echo >&1000
done
node_projects=(`node $config_server/get_project_config.js -type node -attr name`)
for project_name in ${node_projects[@]}
do
sh $pwd_path/base_script/buildNode.sh $project_name $config_server $project_path
# buildNodeProject $project
read -u1000
{
sh $pwd_path/base_script/buildNode.sh $project_name $config_server $project_path
# buildNodeProject $project
echo >&1000
}&
done
wait
elif [ "$project_type" = "python" ]; then
python_projects=(`node $config_server/get_project_config.js -type python -attr name`)
for project_name in ${python_projects[@]}
......@@ -46,29 +78,50 @@ elif [ "$project_type" = "python" ]; then
# buildPythonProject $project
done
else
for ((i=1; i<=5; i++))
do
echo >&1000
done
java_projects=(`node $config_server/get_project_config.js -type java -attr name`)
for project_name in ${java_projects[@]}
do
sh $pwd_path/base_script/buildJava.sh $project_name $config_server $project_path
# buildJavaProject $project $ip
read -u1000
{
sh $pwd_path/base_script/buildJava.sh $project_name $config_server $project_path
# buildJavaProject $project $ip
echo >&1000
}&
done
python_projects=(`node $config_server/get_project_config.js -type python -attr name`)
for project_name in ${python_projects[@]}
do
sh $pwd_path/base_script/buildPython.sh $project_name $config_server $project_path
# buildPythonProject $project $ip
read -u1000
{
sh $pwd_path/base_script/buildPython.sh $project_name $config_server $project_path
# buildPythonProject $project $ip
echo >&1000
}&
done
node_projects=(`node $config_server/get_project_config.js -type node -attr name`)
for project_name in ${node_projects[@]}
do
sh $pwd_path/base_script/buildNode.sh $project_name $config_server $project_path
# buildNodeProject $project $ip
read -u1000
{
sh $pwd_path/base_script/buildNode.sh $project_name $config_server $project_path
# buildNodeProject $project $ip
echo >&1000
}&
done
ui_projects=(`node $config_server/get_project_config.js -type ui -attr name`)
for project_name in ${ui_projects[@]}
do
sh $pwd_path/base_script/buildUi.sh $project_name $config_server $project_path
# buildUiProject $project $ip
read -u1000
{
sh $pwd_path/base_script/buildUi.sh $project_name $config_server $project_path
# buildUiProject $project $ip
echo >&1000
}&
done
wait
buildNginx
fi
#!/bin/bash
project_name=$1
is_public_ip=$2
ip=$3
pwd_path="/home/qa-deploy-utils/qa_shell_script"
config_shell_path="$pwd_path"
config_server="$pwd_path/config_server"
......@@ -8,16 +9,21 @@ project_type=`node $config_server/get_project_config.js -name $project_name -at
project_path=`cat $config_server/project_path.sh`
config_path=`cat $config_server/config_path.sh`
if [ -z "$project_name" ];then
echo "清输入项目名称"
exit -1
fi
if [ "$project_type" = "java" ]; then
sh $pwd_path/base_script/restartJava.sh $project_name $config_server $project_path
sh $pwd_path/base_script/restartJava.sh $project_name $config_server $project_path $ip
# restartJavaProject $project_name $3
elif [ "$project_type" = "node" ]; then
sh $pwd_path/base_script/restartNode.sh $project_name $config_server $project_path
sh $pwd_path/base_script/restartNode.sh $project_name $config_server $project_path $ip
# restartNodeProject $project_name $3
elif [ "$project_type" = "python" ]; then
sh $pwd_path/base_script/restartPython.sh $project_name $config_server $project_path
sh $pwd_path/base_script/restartPython.sh $project_name $config_server $project_path $ip
# restartPythonProject $project_name $3
elif [ "$project_type" = "ui" ]; then
sh $pwd_path/base_script/restartUi.sh $project_name $config_server $project_path
sh $pwd_path/base_script/restartUi.sh $project_name $config_server $project_path $ip
# restartUiProject $project_name $3
fi
......@@ -8,25 +8,47 @@ config_server="$pwd_path/config_server"
project_path=`cat $config_server/project_path.sh`
config_path=`cat $config_server/config_path.sh`
trap "exec 1000>&-;exec 1000<&-;exit 0" 2
tempfifo=$$.fifo
echo "mkfifo /tmp/$tempfifo"
mkfifo /tmp/$tempfifo
exec 1000<>/tmp/$tempfifo
rm -rf /tmp/$tempfifo
function restartJavaProject()
{
for ((i=1; i<=6; i++))
do
echo >&1000
done
projects=(`node $config_server/get_project_config.js -type java -attr name`)
for project_name in ${projects[@]}
do
echo "$config_server"
echo "$project_path"
sh $pwd_path/base_script/restartJava.sh $project_name $config_server $project_path 1
sleep 10s
read -u1000
{
sh $pwd_path/base_script/restartJava.sh $project_name $config_server $project_path 1
echo >&1000
}&
done
wait
}
function restartNodeProject()
{
for ((i=1; i<=6; i++))
do
echo >&1000
done
projects=(`node $config_server/get_project_config.js -type node -attr name`)
for project_name in ${projects[@]}
do
sh $pwd_path/base_script/restartNode.sh $project_name $config_server $project_path
read -u1000
{
sh $pwd_path/base_script/restartNode.sh $project_name $config_server $project_path
echo >&1000
}&
done
wait
}
function restartPythonProject()
......
......@@ -2,13 +2,14 @@
project=$1
config_server=$2
project_path=$3
ip=$4
params=`node $config_server/get_project_config.js -name $project -attr desc/target_path/command2`
params_arry=(${params//|/ })
desc=${params_arry[0]}
target_path=${params_arry[1]}
build_command=${params_arry[2]//\^/ }
sh $config_server/show_info.sh $project BUILD $desc `hostname`
sh $config_server/show_info.sh $project BUILD $desc $ip
cd $project_path/$project
rm -rf $target_path
......@@ -28,10 +29,10 @@ echo "$build_command"
$build_command
if [ $? = 0 ]; then
echo "${project} build ok"
echo "${project} build ok~"
else
echo "${project} build fail"
echo "${project} build fail~"
exit -1
fi
echo "$target_path"
mv $project_path/$project/$target_path/*.jar $project_path/$project/$project.jar
\ No newline at end of file
mv $project_path/$project/$target_path/*.jar $project_path/$project/$project.jar
......@@ -2,6 +2,7 @@
project=$1
config_server=$2
project_path=$3
ip=$4
config_path=`cat $config_server/config_path.sh`
node4_path=`cat $config_server/node_4_path.sh`
node7_path=`cat $config_server/node_7_path.sh`
......@@ -15,7 +16,7 @@ config_file=${params_arry[1]}
command=${params_arry[2]//\^/ }
node_version=${params_arry[3]}
sh $config_server/show_info.sh $project BUILD $desc `hostname`
sh $config_server/show_info.sh $project BUILD $desc $ip
# 第一步 将nginx项目的所有文件进行打包
cd $project_path/$project
#第二步 关联配置文件
......
......@@ -2,13 +2,14 @@
project=$1
config_server=$2
project_path=$3
ip=$4
params=`node $config_server/get_project_config.js -name $project -attr desc/config_file`
params_arry=(${params//|/ })
desc=${params_arry[0]}
config_file=${params_arry[1]}
sh $config_server/show_info.sh $project BUILD $desc `hostname`
sh $config_server/show_info.sh $project BUILD $desc $ip
cd $project_path/$project
setup_path_temp=`find ./ -name "setup.py"`
......
......@@ -2,6 +2,7 @@
project=$1
config_server=$2
project_path=$3
ip=$4
node4_path=`cat $config_server/node_4_path.sh`
node7_path=`cat $config_server/node_7_path.sh`
......@@ -14,7 +15,7 @@ command=${params_arry[2]//\^/ }
node_version=${params_arry[3]}
sh $config_server/show_info.sh $project BUILD $desc `hostname`
sh $config_server/show_info.sh $project BUILD $desc $ip
# 第一步 将nginx项目的所有文件进行打包
cd $project_path/$project
......@@ -26,7 +27,7 @@ if [ -n "$package_check_file" ];then
else
echo "本次package有变更,将要执行npm install"
if [ "$node_version" = "node4" ] ;then
echo "----node-V4---${node4_path}/npm install"
echo "node-V4-${node4_path}/npm install"
${node4_path}/npm --registry http://172.16.3.15:4873 install
else
npm --registry http://172.16.3.15:4873 install
......@@ -50,4 +51,4 @@ if [ $? != 0 ];then
exit -1
fi
# 第二步 不关机使得nginx生效
nginx -t; nginx -s reload
#nginx -t; nginx -s reload
......@@ -2,7 +2,7 @@
project=$1
config_server=$2
project_path=$3
check_ack=$4
ip=$4
profile=test
time=`date +%Y_%m_%d_%H_%M_%S`
......@@ -17,17 +17,17 @@ function ack()
echo "begin acknowledge whether the deploy start OK, ACK_PHRASE=${ack_phrase}, log_path=${log_path}"
while [ ! -f ${log_path} ]
do
echo "waiting for $project log, wait_log_generate_time is ${wait_log_generate_time}, max_wait_log_generate_time is ${max_wait_log_generate_time} "
echo "waiting for $ip $project log, wait_log_generate_time is ${wait_log_generate_time}, max_wait_log_generate_time is ${max_wait_log_generate_time} "
if ((${wait_log_generate_time}>${max_wait_log_generate_time}))
then
echo "the $project log generated time exceed the limit"
echo "the $ip $project log generated time exceed the limit"
exit -1
fi
echo "the $project log does not exist, wait for 5 seconds"
echo "the $ip $project log does not exist, wait for 5 seconds"
sleep 5
let "wait_log_generate_time+=5"
done
echo "listen for the $project log ack..."
echo "listen for the $ip $project log ack..."
for ((i=0;;))
do
bootstrap_flag=`cat ${log_path} |grep "${ack_phrase}"| wc -l`
......@@ -35,13 +35,13 @@ function ack()
then
sleep 5
let "wait_ack_time+=5"
echo "waiting for $project started flag for ${wait_ack_time}"
echo "waiting for $ip $project started flag for ${wait_ack_time} seconds"
elif [ "${bootstrap_flag}" = 1 ]
then
echo "server $project is start in $wait_ack_time seconds~"
echo "server $ip $project startup in $wait_ack_time seconds~"
exit 0
else
echo "server $project not startup in ${max_wait_ack_time} seconds..."
echo "server $ip $project not startup in ${max_wait_ack_time} seconds..."
exit -1
fi
done
......@@ -54,11 +54,11 @@ project=$1
desc=`node $config_server/get_project_config.js -name $project -attr desc`
run_command_=`node $config_server/get_project_config.js -name $project -attr command`
run_command=${run_command_//\^/ }
sh $config_server/show_info.sh $project 重新启动 $desc `hostname`
sh $config_server/show_info.sh $project 重新启动 $desc $ip
cd $project_path/$project
P_UUID=`ps -ef|grep ${project}.jar |grep -v 'grep'|awk '{print $2}'`
if [ -n "${P_UUID}" ];then
echo "--- Kill $project PPID=${P_UUID} ---"
echo "Kill $project PPID=${P_UUID}"
kill -9 ${P_UUID}
sleep 2s
fi
......@@ -82,7 +82,7 @@ else
fi
fi
echo "--- Project: $project will be start ---"
echo "Project: $project will be start"
log_name=`node $config_server/get_project_config.js -name $project -attr log_name`
mv $project_path/logs/$log_name $project_path/logs/$project.log.$time
......
......@@ -2,6 +2,7 @@
project=$1
config_server=$2
project_path=$3
ip=$4
node4_path=`cat $config_server/node_4_path.sh`
node7_path=`cat $config_server/node_7_path.sh`
......@@ -9,7 +10,7 @@ node7_path=`cat $config_server/node_7_path.sh`
desc=`node $config_server/get_project_config.js -name $project -attr desc`
stop_command_=`node $config_server/get_project_config.js -name $project -attr command2`
stop_command=${stop_command_//\^/ }
sh $config_server/show_info.sh $project 重新启动 $desc $2
sh $config_server/show_info.sh $project 重新启动 $desc $ip
cd $project_path/$project
$stop_command
start_command_=`node $config_server/get_project_config.js -name $project -attr command`
......@@ -19,4 +20,4 @@ if [ $? -ne 0 ]
then
echo "Fail to start"
exit -1
fi
\ No newline at end of file
fi
......@@ -2,23 +2,24 @@
project=$1
config_server=$2
project_path=$3
ip=$4
time=`date +%Y_%m_%d_%H_%M_%S`
desc=`node $config_server/get_project_config.js -name $project -attr desc`
port=`node $config_server/get_project_config.js -name $project -attr port`
sh $config_server/show_info.sh $project 重新启动 $desc $2
sh $config_server/show_info.sh $project 重新启动 $desc $ip
cd $project_path/$project
setup_path_temp=`find ./ -name "run.py"`
python_project_path=$project_path/$project${setup_path_temp/\.\//\/}
P_UUID=`ps -ef|grep port=$port |grep -v 'grep'|awk '{print $2}'`
if [[ "${P_UUID}" != "" ]];then
echo "-----KILL $project PPID=${P_UUID}"
echo "KILL $project PPID=${P_UUID}"
kill -9 ${P_UUID}
sleep 3
fi
mv $project_path/logs/${project}.log $project_path/logs/${project}.log.$time
echo "-----project:$project will be run under command:python $python_project_path --mode=beta --port=$port > /dev/null 2>&1 &"
echo "project:$project will be run under command:python $python_project_path --mode=beta --port=$port > /dev/null 2>&1 &"
python $python_project_path --mode=beta --port=$port > /dev/null 2>&1 &
sleep 5
grep "$project started OK" $project_path/logs/${project}.log
......
......@@ -98,7 +98,9 @@ new pClass().init(false, "java", "7066", "", "silk-road", true, "baitiao", "silk
new pClass().init(false, "java", "7059", "", "baitiao-zhitou", true, "baitiao", "baitiao-zhitou.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "白条直投-对接资金方", "张斌", "mvn clean package -Ptest -Dmaven.test.skip=true", "./xyqb-btzt-internal/target/");
new pClass().init(false, "java", "7068", "", "customer_helpdesk", true, "data-riskcontrol", "customer_helpdesk.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "外部客服-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
new pClass().init(true, "java", "7069", "", "notify", true, "fund_pay", "notify.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "支付中心消息通知系统-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
new pClass().init(true, "java", "7071", "", "mall-settlement", true, "baitiao", "mall-settlement.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "商户结算系统", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
new pClass().init(true, "java", "7072", "", "data-taurus",true, "data-riskcontrol", "data-taurus.log", "application.properties", " /dev/null 2>&1 &", null, 2, "质保金-server", "","mvn clean package -Ptest -Dmaven.test.skip=true","");
new pClass().init(true, "java", "7074", "", "account-center",false, "QG", "account_center.log", "application.properties", " /dev/null 2>&1 &", null, 2, "账户中心-server", "","mvn clean package -Ptest -Dmaven.test.skip=true","");
// ui----
new pClass().init(true, "ui", "7032", "", "op-ui", false, "QG", null, "src/js/env.config.js", "npm run build", "node7", 1, "运营系统-ui", "", "", "");
......@@ -117,7 +119,7 @@ new pClass().init(true, "ui", "7058", "", "mall-ui", true, "ui", null, "src/app/
new pClass().init(true, "ui", "7001", "m.xyqb.com", "xyqb-ui", false, "QG", null, "client/app/config.js", "grunt build", "node7", 1, "现金贷和白条-现金贷-ui", "", "", "");
new pClass().init(true, "ui", "7046", "", "activity-op-ui", false, "QG", null, "src/config/env.config.js", "npm run build", "node7", 1, "优惠券管理后台-ui", "", "", "");
new pClass().init(true, "ui", "7048", "", "order-op-ui", false, "OP", null, "src/js/env.config.js", "gulp build", "node7", 1, "订单系统-ui", "", "", "");
new pClass().init(true, "ui", "7002", "", "qgbc-ui", false, "QG", null, "src/app/config/env.config.js", "npm run build_production", "node7", 1, "白条-ui", "", "", "");
new pClass().init(false, "ui", "7002", "", "qgbc-ui", false, "QG", null, "src/app/config/env.config.js", "npm run build_production", "node7", 1, "白条-ui", "", "", "");
new pClass().init(true, "ui", "7057", "", "xjd-ui", false, "QG", null, "src/app/config/env.config.js", "npm run qa", "node7", 1, "新版现金贷-ui", "", "", "");
new pClass().init(true, "ui", "7007", "", "new-paycenter-ui", false, "QG", null, "src/app/config/env.config.js", "npm run qa", "node7", 1, "新版支付中心-ui", "", "", "");
new pClass().init(false, "ui", "7061", "", "wind-control-op-ui", true, "ui", null, "src/app/config/env.config.js", "npm run qa", "node7", 1, "临时项目,未来删除风控平台-ui", "", "", "");
......
#!/bin/bash
echo "\"--------------------------------------------\""
echo "\"--------项目 $1 将要 $2--------\""
echo "\"--------项目描述:$3--------\""
echo "\"--------部署环境:$4--------\""
echo "\"--------------------------------------------\""
echo "[DEPLOY] ------------------------------------------------------------------------"
echo "[DEPLOY] --- 项目 $1 将要 $2 ---"
echo "[DEPLOY] --- 项目描述:$3 ---"
echo "[DEPLOY] --- 部署环境:$4 ---"
echo "[DEPLOY] ------------------------------------------------------------------------"
......@@ -2,36 +2,42 @@
project_name=$1
branch_name=$2
public_ip=$3
ip=$4
sh /home/qa-deploy-utils/qa_shell_script/2_get_code_by_name.sh $project_name $branch_name $4
if [ -z "$project_name" ];then
echo "清输入项目名称"
exit -1
fi
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 ---"
echo "--- $ip $project_name 2_get_code_by_name ok ---"
else
echo "--- $project_name 2_get_code_by_name fail ---"
echo "--- $ip $project_name 2_get_code_by_name fail ---"
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 ---"
echo "--- $ip $project_name 3_link_config_file_by_name ok ---"
else
echo "--- $project_name 3_link_config_file_by_name fail ---"
echo "--- $ip $project_name 3_link_config_file_by_name fail ---"
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 ---"
echo "--- $ip $project_name 4_build_by_name ok ---"
else
echo "--- $project_name 4_build_by_name fail ---"
echo "--- $ip $project_name 4_build_by_name fail ---"
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 ---"
echo "--- $ip $project_name 5_restart_by_name ok ---"
else
echo "--- $project_name 5_restart_by_name fail ---"
echo "--- $ip $project_name 5_restart_by_name fail ---"
exit -1
fi
......@@ -34,36 +34,36 @@ function deploy()
{
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 ---"
echo "--- $ip 2_get_code_by_name $project_name ok ---"
else
echo "--- $project_name 2_get_code_by_name fail ---"
echo "--- $ip 2_get_code_by_name $project_name fail ---"
echo >&1000
exit -1
fi
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 ---"
echo "--- $ip 3_link_config_file_by_name $project_name ok ---"
else
echo "--- $project_name 3_link_config_file_by_name fail ---"
echo "--- $ip 3_link_config_file_by_name $project_name fail ---"
echo >&1000
exit -1
fi
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 ---"
echo "--- $ip 4_build_by_name $project_name ok ---"
else
echo "--- $project_name 4_build_by_name fail ---"
echo "--- $ip 4_build_by_name $project_name fail ---"
echo >&1000
exit -1
fi
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 ---"
echo "--- $ip 5_restart_by_name $project_name ok ---"
else
echo "--- $project_name 5_restart_by_name fail ---"
echo "--- $ip 5_restart_by_name $project_name fail ---"
echo >&1000
exit -1
fi
......
......@@ -46,6 +46,10 @@ tranceConfig java "11fb7f6a8b8edf2776a72c2f5624229c" "0849d140bbb50de8fceae2c469
tranceConfig ui "wx89894cd83d117b26" "wxdf0392b9a648b646" "192.168.4.12" "xyqb-user-ui.js"
tranceConfig ui "11fb7f6a8b8edf2776a72c2f5624229c" "0849d140bbb50de8fceae2c4694e2e3f" "192.168.4.12" "xyqb-user-ui.js"
tranceConfig ui "wechattest.xyqb.com" "wechattest2.xyqb.com" "192.168.4.12" "xyqb-user-ui.js"
tranceConfig java "kamen.customerid=test" "kamen.phone.customerid=803571" "192.168.4.12" "xyqb-mall.properties"
tranceConfig java "kamen.secretkey=12345678901234567890" "kamen.secretkey=281383FDF56E65D3FDA88343113B3631" "192.168.4.12" "xyqb-mall.properties"
tranceConfig java "kamen.customerid=test" "kamen.phone.customerid=803571" "192.168.4.12" "xyqb-mall.properties"
tranceConfig java "kamen.phone.url=http://192.168.4.241" "kamen.phone.url=http://ccapi.soouu.cn" "192.168.4.12" "xyqb-mall.properties"
# tranceConfig node "host: \'http:\/\/192.168.4.12:7013" "host: \'http:\/\/192.168.4.12:7042" "192.168.4.12" "AppBackend.js"
# tranceConfig node "host.*7042" "host: 'http:\/\/192.168.4.12:7013" "192.168.4.12" "AppBackend.js"
......
#!/bin/bash
cd $JENKINS_HOME/jobs/$JOB_BASE_NAME/builds/${BUILD_NUMBER}
grep "_by_name fail" log
grep " fail ---" log
if [ $? = 0 ];then
exit -1
fi
......
......@@ -3,7 +3,6 @@ cd $JENKINS_HOME/jobs/$JOB_BASE_NAME/builds/${BUILD_NUMBER}
grep "build fail~" log
grep "generated time exceed the limit" log
grep "not startup in" log
grep "not startup in" log
if [ $? = 0 ];then
exit -1
fi
......
#!/bin/bash
rm -rf /usr/local/Cellar/maven/3.3.9/libexec/repo/cn/quantgroup/xyqb-user-rpc-commons
......@@ -11,7 +11,6 @@ function mock()
echo "yeepay.v2.xyqb.privateKey=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBANSBQSc0Hlr+mS7uoIjYS71X2DJ6ZrCcbB1uICqty9QY6W16nZ8tLN/d9k2Z+e2rGG8s7PskpU2T+WuJeDSXs/vpPllG8/tSRVaWcr9EzPaSti3ltSUH0QOLSypZEjTT/slscExj4PMOmQXUXP3gewjNWz1cYRI7dGnKPm+ZFah/AgMBAAECgYB8AcFngz6DkzcI8C+2K6JnJ6/+JPdv8JgWxID45tqfNrphLMB2dwJM0VY+CrCSRNnJZsoT9FqSXtuaKWqAJlbchhPZjupA9RkWFzlGpCQ63/CC71RYYY03eCnc7AIpn52whkjfWG/yf57jKzEwUT+U034uvXdaA+lVvJ0xqpj3gQJBAOmLODjecn450TJbNQaop+7Q5Hz2TUIxbYakzPpcLGv1QYgHa657r7PJ23ZltDBGldMaNTZfqJrtDcq0rTA4lBECQQDo8CcdUhMZ3JbR2UZN0CG8ljMbNWgNWBa37ebE3ZG5yYldc7zY9US/+/7lhxNDqG0saTvM9pJwEc3ccVMvksOPAkEAqq7V+zIQKVJmItBn06MFgNNoei+kTUFEk8f0CvG8gXYwW5NYzp+UzOg1HbW82B9uNmeMBl4pInknwEMF5B0lkQJAdRxQPgCGk+kAdo6LNxHd9Ed7eEF4h8Ty3xQfgnh3DHYTtsU6e8WMBA24kENB3zEtejeKFjkdVHTPD/Z1wSRDZwJAAvNuq0YuRDsESOAerkBZKonA5CD0M4vHTRqihHrjBohv6yxBU8P7gALrX7qmoaZ3aLmN8wHdOAGTR6LZjQdkoQ==" >> /home/quant_group/gu-bei/config/application.properties
echo "yeepay.v2.xyqb.yeepay.publicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDUgUEnNB5a/pku7qCI2Eu9V9gyemawnGwdbiAqrcvUGOltep2fLSzf3fZNmfntqxhvLOz7JKVNk/lriXg0l7P76T5ZRvP7UkVWlnK/RMz2krYt5bUlB9EDi0sqWRI00/7JbHBMY+DzDpkF1Fz94HsIzVs9XGESO3Rpyj5vmRWofwIDAQAB" >> /home/quant_group/gu-bei/config/application.properties
echo "yeepay.v2.apihost=http://192.168.4.241:10086/tzt-api/api/" >> /home/quant_group/gu-bei/config/application.properties
/home/qa-deploy-utils/qa_shell_script/5_restart_by_name.sh gu-bei
}
function unmock()
......@@ -22,7 +21,6 @@ function unmock()
sed -i "/yeepay.v2.xyqb.yeepay.publicKey/d" /home/quant_group/gu-bei/config/application.properties
sed -i "/yeepay.v2.apihost/d" /home/quant_group/gu-bei/config/application.properties
fi
/home/qa-deploy-utils/qa_shell_script/5_restart_by_name.sh gu-bei
}
if [[ $1 = "yes" ]]; then
......@@ -30,3 +28,31 @@ if [[ $1 = "yes" ]]; then
else
unmock
fi
sh /home/qa-deploy-utils/qa_shell_script/2_get_code_by_name.sh gu-bei
if [ $? = 0 ]; then
echo "2_get_code_by_name ok"
else
echo "2_get_code_by_name fail"
exit -1
fi
sh /home/qa-deploy-utils/qa_shell_script/3_link_config_file_by_name.sh gu-bei
if [ $? = 0 ]; then
echo "3_link_config_file_by_name ok"
else
echo "3_link_config_file_by_name fail"
exit -1
fi
sh /home/qa-deploy-utils/qa_shell_script/4_build_by_name.sh gu-bei
if [ $? = 0 ]; then
echo "4_build_by_name ok"
else
echo "4_build_by_name fail"
exit -1
fi
/home/qa-deploy-utils/qa_shell_script/5_restart_by_name.sh gu-bei
if [ $? = 0 ]; then
echo "5_restart_by_name ok"
else
echo "5_restart_by_name fail"
exit -1
fi
......@@ -2,10 +2,10 @@
pwd_path="/home/qa-deploy-utils/qa_shell_script"
config_shell_path="$pwd_path"
config_server="$pwd_path/config_server"
filename=/home/quant_group/frp_0.12.0_linux_amd64/frpc_custom.ini
filename=/home/quant_group/frp_0.12.0_linux_amd64/frpc_custom_new.ini
IP_host_first="192.168.4."
ips=`cat $config_server/get_env_ip.sh`
rm -rf $filename
function addFileHead()
{
rm -rf $1
......@@ -30,6 +30,29 @@ function addFileHead()
addFileHead $filename
function addFile2()
{
echo "$1 $2 $3 $4"
echo "[web-$2-$1-http]" >> $4
echo "type = http" >> $4
echo "local_ip = 192.168.4.$1" >> $4
echo "local_port = 1$3" >> $4
echo "subdomain = $2" >> $4
echo "[web-$2-$1-https]" >> $4
echo "type = https" >> $4
echo "local_ip = 192.168.4.$1" >> $4
echo "local_port = 2$3" >> $4
echo "subdomain = $2" >> $4
}
projectAndPort=`node $config_server/get_project_config.js -type multi -attr port`
for projectAndPort in ${projectAndPort[@]}
do
var=${projectAndPort//|/ }
addFile2 25 $var $filename
done
function addFile()
{
echo "$1 $2 $3 $4"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment