Skip to content

Q
qa-deploy-utils
Commit 7848ff1f authored by root's avatar root
Browse files
Options

aaa

parents 0c39b2a9 c37e4845
Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 23 deletions
db-utils/db_gen_config.sh
View file @ 7848ff1f
...@@ -62,7 +62,7 @@ elif [[ $database_name = 'dujiangyan' ]]; then ...@@ -62,7 +62,7 @@ elif [[ $database_name = 'dujiangyan' ]]; then
port='3310' port='3310'
elif [[ $database_name = 'mall' ]]; then elif [[ $database_name = 'mall' ]]; then
# 白条商城 # 白条商城
sys_table_list='mall_config activity_3c_product ad_detail new_3c_product supplier 3c_product 3c_product_spec apix_phone_recharge_detail apix_recharge_project apix_recharge_project_bak category configuration course_detail_info course_info merchant pay19_recharge_project mall_category product product_sku product_sku_image product_spu product_nature nature_value product_category spu_image product_nature_value goods_after_sale_step goods_after_sale_config brand' sys_table_list='mall_config activity_3c_product ad_detail new_3c_product supplier 3c_product 3c_product_spec apix_phone_recharge_detail apix_recharge_project apix_recharge_project_bak category configuration course_detail_info course_info merchant pay19_recharge_project mall_category product product_sku product_sku_image product_spu product_nature nature_value product_category spu_image product_nature_value goods_after_sale_step goods_after_sale_config brand advertisement_type'
port='3310' port='3310'
elif [[ $database_name = 'qinqiong' ]]; then elif [[ $database_name = 'qinqiong' ]]; then
# qinqiong # qinqiong
......
db-utils/db_replace_ip.sh
View file @ 7848ff1f
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# Revision: 1.1 # Revision: 1.1
# Date: 2017/02 # Date: 2017/02
# Author: dekun.dai # Author: dekun.dai
# Description: 该脚本根据备份sql称特定环境使用的sql，例如：xyqb_192.168.4.3。 # Description: 该脚本根据备份sql称特定环境使用的sql
# Usage：used by ../deploy/db_replace_ip.sh # Usage：used by ../deploy/db_replace_ip.sh
# ------------------------------------------------------------------------------- # -------------------------------------------------------------------------------
database_name=$1 database_name=$1
......
db-utils/sql_to_run/qinqiong.sql
View file @ 7848ff1f
UPDATE `qinqiong`.`secure_key` SET qinqiong.`secure_key`.`public_key` = '-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvKEKOt+IJH6v2vA2y3lj\n4BA+Exi9dK6Chol4sS85Na6br0I03KG4Qg7W5KA9CsWtPM07AxBizr5QsCt7CvT/\nHJUNs8hxSBfseW/eoL6PDwvgjfaAlGQ/hradqnzmU3c9za13E6Qmj64s+ZuNog0l\nsavlbKXlMp5riv4Rd6qZ5BXBRqB8zEhqgdLmW5QV9PYp8XNbmcRv/XRtFVQgSnig\npslVKJRCi0RuGuYr0JMk3Eg+7ZPYhYA6Y35xY6F3Ln6lGkjq1hOhaKzTHFkxTB0H\nu1jz6e+xfVrKWt7q+B8581367pTKxbec3lsylmI+gUOeHDtDn6Gtvcm8M/rpV/Y0\n6wIDAQAB\n-----END PUBLIC KEY-----' WHERE qinqiong.`secure_key`.`merchant_id` = 'xyqb_mall'; UPDATE `qinqiong`.`secure_key` SET qinqiong.`secure_key`.`public_key` = '-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvKEKOt+IJH6v2vA2y3lj\n4BA+Exi9dK6Chol4sS85Na6br0I03KG4Qg7W5KA9CsWtPM07AxBizr5QsCt7CvT/\nHJUNs8hxSBfseW/eoL6PDwvgjfaAlGQ/hradqnzmU3c9za13E6Qmj64s+ZuNog0l\nsavlbKXlMp5riv4Rd6qZ5BXBRqB8zEhqgdLmW5QV9PYp8XNbmcRv/XRtFVQgSnig\npslVKJRCi0RuGuYr0JMk3Eg+7ZPYhYA6Y35xY6F3Ln6lGkjq1hOhaKzTHFkxTB0H\nu1jz6e+xfVrKWt7q+B8581367pTKxbec3lsylmI+gUOeHDtDn6Gtvcm8M/rpV/Y0\n6wIDAQAB\n-----END PUBLIC KEY-----' WHERE qinqiong.`secure_key`.`merchant_id` = 'xyqb_mall';
UPDATE risk_control.user SET enable = 1 WHERE username = 'zhouqian';
\ No newline at end of file
qa_shell_script/5_restart_by_name.sh
View file @ 7848ff1f
...@@ -52,12 +52,12 @@ function restartJavaProject() ...@@ -52,12 +52,12 @@ function restartJavaProject()
mv $project_path/logs/$log_name $project_path/logs/$project.log.$time mv $project_path/logs/$log_name $project_path/logs/$project.log.$time
#if [[ $project == "redpacket" ]]; then if [[ $project == "redpacket" ]]; then
# echo `java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -jar ${project}.jar --worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &` echo `java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -jar ${project}.jar --worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &`
#else else
# echo `java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -jar ${project}.jar --worker 1 --currentWorker 1 -t > /dev/null 2>&1 &`
#fi
echo `java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -jar ${project}.jar --worker 1 --currentWorker 1 -t > /dev/null 2>&1 &` echo `java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -jar ${project}.jar --worker 1 --currentWorker 1 -t > /dev/null 2>&1 &`
fi
# echo `java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -jar ${project}.jar --worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &`
#sleep 30s #sleep 30s
ack "$ack_phrase" $project_path/logs/$log_name ${max_wait_log_generate_time} ${max_wait_ack_time} ack "$ack_phrase" $project_path/logs/$log_name ${max_wait_log_generate_time} ${max_wait_ack_time}
......
qa_shell_script/config_server/get_project_config.js
View file @ 7848ff1f
...@@ -78,6 +78,7 @@ new pClass().init(true, "java", "7014", "du-jiang-yan", false, "QG", "du_jiang_y ...@@ -78,6 +78,7 @@ new pClass().init(true, "java", "7014", "du-jiang-yan", false, "QG", "du_jiang_y
new pClass().init(false, "java", "7051", "msg", false, "QG", "msg.log", "application.properties", null, null, 2, "新版消息中心",""); new pClass().init(false, "java", "7051", "msg", false, "QG", "msg.log", "application.properties", null, null, 2, "新版消息中心","");
new pClass().init(false, "java", "7052", "xyqb-btzt", true, "git@gitabc.xyqb.com:qg-op-backend/xyqb-btzt.git", "xyqb-btzt.log", "application.properties", null, null, 2, "白条直投外部",""); new pClass().init(false, "java", "7052", "xyqb-btzt", true, "git@gitabc.xyqb.com:qg-op-backend/xyqb-btzt.git", "xyqb-btzt.log", "application.properties", null, null, 2, "白条直投外部","");
new pClass().init(false, "java", "7053", "xyqb-btzt-internal", true, "git@gitabc.xyqb.com:qg-op-backend/xyqb-btzt-internal.git", "xyqb-btzt-internal.log", "application.properties", null, null, 2, "白条直投内部",""); new pClass().init(false, "java", "7053", "xyqb-btzt-internal", true, "git@gitabc.xyqb.com:qg-op-backend/xyqb-btzt-internal.git", "xyqb-btzt-internal.log", "application.properties", null, null, 2, "白条直投内部","");
new pClass().init(false, "java", "7060", "xyqb-backend", true, "git@gitabc.xyqb.com:qg-op-backend/xyqb-backend.git", "xyqb-backend.log", "application.properties", null, null, 2, "运营系统服务","");
// new pClass(true,"java","7027","sms-center","QG","sms-center.log",null,null,null,"短信中心-server"); // new pClass(true,"java","7027","sms-center","QG","sms-center.log",null,null,null,"短信中心-server");
// ui---- // ui----
// projectName,projectType,port,gitPath,logName,configFile,command,nodeVersion // projectName,projectType,port,gitPath,logName,configFile,command,nodeVersion
...@@ -99,7 +100,7 @@ new pClass().init(true, "ui", "7046", "activity-op-ui", false, "QG", null, "src/ ...@@ -99,7 +100,7 @@ new pClass().init(true, "ui", "7046", "activity-op-ui", false, "QG", null, "src/
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", "7048", "order-op-ui", false, "OP", null, "src/js/env.config.js", "gulp build", "node7", 1, "订单系统-ui","");
new pClass().init(true, "ui", "7002", "bt-ui", false, "QG", null, "src/app/config/env.config.js", "npm run qa", "node7", 1, "新版白条-ui",""); new pClass().init(true, "ui", "7002", "bt-ui", false, "QG", null, "src/app/config/env.config.js", "npm run qa", "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", "7057", "xjd-ui", false, "QG", null, "src/app/config/env.config.js", "npm run qa", "node7", 1, "新版现金贷-ui","");
new pClass().init(true, "ui", "7059", "new-paycenter-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","");
// node // node
new pClass().init(true, "node", "7018", "AppBackend", false, "QG", null, "config/environment/test.js", "forever start -a -s --uid AppBackend bin/www", null, 1, "APP后台服务-server","","forever stop AppBackend"); new pClass().init(true, "node", "7018", "AppBackend", false, "QG", null, "config/environment/test.js", "forever start -a -s --uid AppBackend bin/www", null, 1, "APP后台服务-server","","forever stop AppBackend");
new pClass().init(true, "node", "7041", "activity-op", false, "QG", null, "src/config.js", "sh start.sh", null, 1, "优惠券中心-server","","sh stop.sh"); new pClass().init(true, "node", "7041", "activity-op", false, "QG", null, "src/config.js", "sh start.sh", null, 1, "优惠券中心-server","","sh stop.sh");
......
qa_shell_script/deploy_project_by_name.sh
View file @ 7848ff1f
...@@ -3,11 +3,11 @@ project_name=$1 ...@@ -3,11 +3,11 @@ project_name=$1
branch_name=$2 branch_name=$2
public_ip=$3 public_ip=$3
sh 2_get_code_by_name.sh $project_name $branch_name sh /home/qa-deploy-utils/qa_shell_script/2_get_code_by_name.sh $project_name $branch_name
if [[ $? == 128 ]]; then if [[ $? == 128 ]]; then
echo "Invalid argument to exit" echo "Invalid argument to exit"
exit exit
fi fi
sh 3_link_config_file_by_name.sh $project_name $public_ip sh /home/qa-deploy-utils/qa_shell_script/3_link_config_file_by_name.sh $project_name $public_ip
sh 4_build_by_name.sh $project_name $public_ip sh /home/qa-deploy-utils/qa_shell_script/4_build_by_name.sh $project_name $public_ip
sh 5_restart_by_name.sh $project_name $public_ip sh /home/qa-deploy-utils/qa_shell_script/5_restart_by_name.sh $project_name $public_ip
\ No newline at end of file
qa_shell_script/exception_sub_shell.sh
View file @ 7848ff1f
...@@ -57,6 +57,9 @@ tranceConfig java "xyqb.is.debug=0" "xyqb.is.debug=1" "192.168.4.14" "xyqb.prope ...@@ -57,6 +57,9 @@ tranceConfig java "xyqb.is.debug=0" "xyqb.is.debug=1" "192.168.4.14" "xyqb.prope
#tranceConfig java "192.168.4.14:3306" "192.168.4.20:3306" "192.168.4.14" "*" #tranceConfig java "192.168.4.14:3306" "192.168.4.20:3306" "192.168.4.14" "*"
#tranceConfig java "192.168.4.14:7007" "139.198.2.95:1407" "192.168.4.14" "gu-bei.properties" #tranceConfig java "192.168.4.14:7007" "139.198.2.95:1407" "192.168.4.14" "gu-bei.properties"
#tranceConfig python "192.168.4.14" "192.168.4.20" "192.168.4.14" "qin-qiong.*" #tranceConfig python "192.168.4.14" "192.168.4.20" "192.168.4.14" "qin-qiong.*"
#tranceConfig java "pay.debug=0" "pay.debug=1" "192.168.4.14" "xyqb-mall.properties"
#4.15 #4.15
#tranceConfig java "192.168.4.15:7007" "139.198.2.95:1507" "192.168.4.15" "gu-bei.properties" #tranceConfig java "192.168.4.15:7007" "139.198.2.95:1507" "192.168.4.15" "gu-bei.properties"
...@@ -67,7 +70,7 @@ tranceConfig java "xyqb.is.debug=0" "xyqb.is.debug=1" "192.168.4.14" "xyqb.prope ...@@ -67,7 +70,7 @@ tranceConfig java "xyqb.is.debug=0" "xyqb.is.debug=1" "192.168.4.14" "xyqb.prope
#tranceConfig java "wx7bf214ccdcbd2e16" "wx0a7c0bce0c3ac523" "192.168.4.15" "gu-bei.properties" #tranceConfig java "wx7bf214ccdcbd2e16" "wx0a7c0bce0c3ac523" "192.168.4.15" "gu-bei.properties"
#tranceConfig java "paycenter.host.url=http:\/\/192.168.4.15:7007" "paycenter.host.url=http:\/\/wechattest1.xyqb.com" "192.168.4.15" "gu-bei.properties" #tranceConfig java "paycenter.host.url=http:\/\/192.168.4.15:7007" "paycenter.host.url=http:\/\/wechattest1.xyqb.com" "192.168.4.15" "gu-bei.properties"
#tranceConfig java "139.198.2.95:1507" "wechattest1.xyqb.com" "192.168.4.15" "gu-bei.properties" #tranceConfig java "139.198.2.95:1507" "wechattest1.xyqb.com" "192.168.4.15" "gu-bei.properties"
tranceConfig java "qgbc-ui.url=http://192.168.4.15:7002" "qgbc-ui.url=http://192.168.4.15:7057" "192.168.4.15" "xyqb.properties" tranceConfig java "xyqb-ui.url=http://192.168.4.15:7001" "xyqb-ui.url=http://192.168.4.15:7057" "192.168.4.15" "xyqb.properties"
#4.16 #4.16
...@@ -77,9 +80,10 @@ tranceConfig java "qgbc-ui.url=http://192.168.4.15:7002" "qgbc-ui.url=http://192 ...@@ -77,9 +80,10 @@ tranceConfig java "qgbc-ui.url=http://192.168.4.15:7002" "qgbc-ui.url=http://192
#4.18 #4.18
#4.22 #4.22
tranceConfig node "112233445512345.ittun.com" "activity-op-22.ss.xyqb.loan" "192.168.4.22" "activity-op.js" #tranceConfig node "112233445512345.ittun.com" "activity-op-22.ss.xyqb.loan" "192.168.4.22" "activity-op.js"
tranceConfig java "xyqb.is.debug=1" "xyqb.is.debug=0" "192.168.4.22" "baitiao.properties" #tranceConfig java "xyqb.is.debug=1" "xyqb.is.debug=0" "192.168.4.22" "baitiao.properties"
#tranceConfig java "7002" "7050" "192.168.4.22" "baitiao.properties"
#tranceConfig node "7002" "7050" "192.168.4.22" "AppBackend.js"
#4.23 #4.23
#tranceConfig node "db: {\n host: '192.168.4.23'" "db: {\n host: '192.168.4.8'" "192.168.4.23" "*" #tranceConfig node "db: {\n host: '192.168.4.23'" "db: {\n host: '192.168.4.8'" "192.168.4.23" "*"
#tranceConfig java "192.168.4.23:3306" "192.168.4.8:3306" "192.168.4.23" "*" #tranceConfig java "192.168.4.23:3306" "192.168.4.8:3306" "192.168.4.23" "*"
...@@ -103,4 +107,9 @@ tranceConfig java "xyqb-ui.url=http:\/\/192.168.4.151:7001" "xyqb-ui.url=http:\/ ...@@ -103,4 +107,9 @@ tranceConfig java "xyqb-ui.url=http:\/\/192.168.4.151:7001" "xyqb-ui.url=http:\/
tranceConfig node "d45o0qd" "5exp2xo" "192.168.4.152" "op-api.js" tranceConfig node "d45o0qd" "5exp2xo" "192.168.4.152" "op-api.js"
#tranceConfig java "qgbc-ui.url=http:\/\/192.168.4.152:7002" "qgbc-ui.url=http:\/\/192.168.4.152:7050" "192.168.4.152" "xyqb.properties" #tranceConfig java "qgbc-ui.url=http:\/\/192.168.4.152:7002" "qgbc-ui.url=http:\/\/192.168.4.152:7050" "192.168.4.152" "xyqb.properties"
#tranceConfig java "7025" "7003" "192.168.4.152" "baitiao.properties" #tranceConfig java "7025" "7003" "192.168.4.152" "baitiao.properties"
#tranceConfig ui "wechattest.xyqb.com" "wechattest1.xyqb.com" "192.168.4.22" "xyqb-user-ui.js"
tranceConfig java "baitiao_redpacket_notify_url=http:\/\/192.168.4.12:7031\/redpacket\/distribute\/" "baitiao_redpacket_notify_url=http:\/\/192.168.4.12:7031" "192.168.4.12" "baitiao.properties"
tranceConfig nginx "\/home\/quant_group\/paycenter-ui\/dist" "\/home\/quant_group\/new-paycenter-ui\/dist" "192.168.4.14" "paycenter-ui.conf"
qa_shell_script/initial_env/db_tran.sh
View file @ 7848ff1f
...@@ -3,6 +3,6 @@ ip=`ifconfig eth0 | grep "inet addr" | awk '{ print $2}' | awk -F: '{print $2}'` ...@@ -3,6 +3,6 @@ ip=`ifconfig eth0 | grep "inet addr" | awk '{ print $2}' | awk -F: '{print $2}'`
cd /home cd /home
rm -rf *.sql rm -rf *.sql
mysqldump -u qa -pqatest -A > all.sql mysqldump -u qa -pqatest -A > all.sql
sed -i "s/192.168.4.15/$ip/g" all.sql sed -i "s/$1/$ip/g" all.sql
mysql -u qa -pqatest -A < all.sql mysql -u qa -pqatest -A < all.sql
qa_shell_script/log_shell/remove_logs.sh
View file @ 7848ff1f
...@@ -29,3 +29,5 @@ for i in `find . -name "*.log"`; do cat /dev/null >$i; done ...@@ -29,3 +29,5 @@ for i in `find . -name "*.log"`; do cat /dev/null >$i; done
cd /home/quant_group/op-api/logs cd /home/quant_group/op-api/logs
rm -rf *.log.* rm -rf *.log.*
for i in `find . -name "*.log"`; do cat /dev/null >$i; done for i in `find . -name "*.log"`; do cat /dev/null >$i; done
rm -rf /tmp/*
qa_shell_script/ngrok/make_ngrok_yml.sh
View file @ 7848ff1f
...@@ -57,7 +57,7 @@ function addFile() ...@@ -57,7 +57,7 @@ function addFile()
# port=`node $config_server/get_project_config.js -name $project -attr port` # port=`node $config_server/get_project_config.js -name $project -attr port`
# addFile $project $port $filename # addFile $project $port $filename
#done #done
projects_of_out_proxy=( gu-bei activity-op op-api spider-center di-ting merchant-backend cash-loan-flow xyqb xyqb-quartz xyqb-query qgbc-ui bt-ui xyqb-ui ) projects_of_out_proxy=( gu-bei activity-op op-api spider-center di-ting merchant-backend cash-loan-flow xyqb xyqb-quartz xyqb-query qgbc-ui bt-ui xyqb-ui xyqb-user-ui )
for ip_last in ${ips[@]} for ip_last in ${ips[@]}
......
qa_shell_script/rabbitmq/initial_mq.sh
View file @ 7848ff1f
...@@ -17,6 +17,10 @@ function add_queues() ...@@ -17,6 +17,10 @@ function add_queues()
/home/qa-deploy-utils/qa_shell_script/rabbitmq/rabbitmqadmin declare queue --vhost=$1 name=$2 durable=true -u qa -p qatest /home/qa-deploy-utils/qa_shell_script/rabbitmq/rabbitmqadmin declare queue --vhost=$1 name=$2 durable=true -u qa -p qatest
} }
function add_binding()
{
/home/qa-deploy-utils/qa_shell_script/rabbitmq/rabbitmqadmin --vhost=$1 declare binding source=$2 destination=$3 routing_key=$4 -u qa -p qatest
}
#ad vhost #ad vhost
add_vhost / add_vhost /
...@@ -35,7 +39,7 @@ add_vhost bt_loan ...@@ -35,7 +39,7 @@ add_vhost bt_loan
add_vhost baitiao_qrcode add_vhost baitiao_qrcode
add_vhost bt_loan add_vhost bt_loan
add_vhost /pay_center add_vhost /pay_center
add_vhost backend
#add exchange #add exchange
add_exchange / hello-exchange direct add_exchange / hello-exchange direct
add_exchange /black_hole contract direct add_exchange /black_hole contract direct
...@@ -52,9 +56,9 @@ add_exchange xyqb_push events direct ...@@ -52,9 +56,9 @@ add_exchange xyqb_push events direct
add_exchange bt_loan bt_loan_exchange direct add_exchange bt_loan bt_loan_exchange direct
add_exchange baitiao_debt baitiaodebt_orderinfo direct add_exchange baitiao_debt baitiaodebt_orderinfo direct
add_exchange baitiao_qrcode qrcode fanout add_exchange baitiao_qrcode qrcode fanout
add_exchange bt_loan_exchange driect
add_exchange /pay_center paycenter_exchange direct add_exchange /pay_center paycenter_exchange direct
add_exchange backend backend_message_rewrite_exc direct
add_exchange backend backend_file_exc direct
#add queues #add queues
add_queues /black_hole contractQueue add_queues /black_hole contractQueue
add_queues /black_hole generate_success add_queues /black_hole generate_success
...@@ -96,4 +100,10 @@ add_queues /black_hole waiting_mult_generate ...@@ -96,4 +100,10 @@ add_queues /black_hole waiting_mult_generate
add_queues financial_system xyqb add_queues financial_system xyqb
add_queues /pay_center withhold_single_service_fee_queue add_queues /pay_center withhold_single_service_fee_queue
add_queues /pay_center result_single_service_fee_queue add_queues /pay_center result_single_service_fee_queue
add_queues backend backend_message_rewrite_queue
add_queues backend backend_file_queue
#add bindings
add_binding backend backend_message_rewrite_exc backend_message_rewrite_queue backend_message_rewrite_route
add_binding backend backend_file_exc backend_file_queue backend_file_route
qa_shell_script/remote_excute_new.sh
View file @ 7848ff1f
...@@ -14,6 +14,7 @@ branch_name : ${branch_name} ...@@ -14,6 +14,7 @@ branch_name : ${branch_name}
project_type : ${project_type} project_type : ${project_type}
public_ip : ${public_ip} public_ip : ${public_ip}
" "
<<<<<<< HEAD
sshpass -p '!QAZ2wsx' ssh root@${ip} sshpass -p '!QAZ2wsx' ssh root@${ip}
ifconfig ifconfig
if [ -n "$project_name" ] && [ -n "$branch_name" ]; then if [ -n "$project_name" ] && [ -n "$branch_name" ]; then
...@@ -22,5 +23,17 @@ if [ -n "$project_name" ] && [ -n "$branch_name" ]; then ...@@ -22,5 +23,17 @@ if [ -n "$project_name" ] && [ -n "$branch_name" ]; then
else else
sshpass -p '!QAZ2wsx' ssh root@${ip} "cd /home/qa-deploy-utils/qa_shell_script" 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} "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
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_name.sh $project_name $branch_name $public_ip
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 fi
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