diff --git a/dsl/003sync_code_prod.sh b/dsl/003sync_code_prod.sh index d40908b..7a57572 100644 --- a/dsl/003sync_code_prod.sh +++ b/dsl/003sync_code_prod.sh @@ -194,30 +194,30 @@ commit_target() { git push origin $target_branch } -#source_pull -#target_pull -#source_build -#target_pull -#sync_files -#target_build -#commit_target -# -#kls_source_path=/home/www/sync_code/sd_dsl/wms85std-sd-dsl-prod -# -#echo -e "$echoPrefix cd $kls_source_path $echoSuffix" -#cd $kls_source_path -#echo -e "$echoPrefix git checkout -b release/prod kls/release/prod $echoSuffix" -#git checkout -b release/prod kls/release/prod || true -#echo -e "$echoPrefix git checkout release/prod $echoSuffix" -#git checkout release/prod -#echo -e "$echoPrefix git pull kls release/prod:release/prod -f $echoSuffix" -#git pull kls release/prod:release/prod -f -# -#echo -e "$echoPrefix git push dsl release/prod:release/prod -f $echoSuffix" -#git push dsl release/prod:release/prod -f -#echo "" -#echo "接下来:登录大参林能笑平台,等待构建完成,手动部署应用。[$(date +%Y-%m-%d' '%H:%M:%S)]" - -echo "维护中,请稍候..." +source_pull +target_pull +source_build +target_pull +sync_files +target_build +commit_target + +kls_source_path=/home/www/sync_code/sd_dsl/wms85std-sd-dsl-prod + +echo -e "$echoPrefix cd $kls_source_path $echoSuffix" +cd $kls_source_path +echo -e "$echoPrefix git checkout -b release/prod kls/release/prod $echoSuffix" +git checkout -b release/prod kls/release/prod || true +echo -e "$echoPrefix git checkout release/prod $echoSuffix" +git checkout release/prod +echo -e "$echoPrefix git pull kls release/prod:release/prod -f $echoSuffix" +git pull kls release/prod:release/prod -f + +echo -e "$echoPrefix git push dsl release/prod:release/prod -f $echoSuffix" +git push dsl release/prod:release/prod -f +echo "" +echo "接下来:登录大参林能笑平台,等待构建完成,手动部署应用。[$(date +%Y-%m-%d' '%H:%M:%S)]" + +#echo "维护中,请稍候..." # bash <(curl -s http://git.yvanui.com/lizhiwei/jztd-deploy/raw/master/dsl/003sync_code_prod.sh) diff --git a/dsl/004sync_code_test.sh b/dsl/004sync_code_test.sh index ec9e6f5..fc60b78 100644 --- a/dsl/004sync_code_test.sh +++ b/dsl/004sync_code_test.sh @@ -194,31 +194,31 @@ commit_target() { git push origin $target_branch } -#source_pull -#target_pull -#source_build -#target_pull -#sync_files -#target_build -#commit_target -# -#cmd=$1 -#kls_source_path=/home/www/sync_code/sd_dsl/wms85std-sd-dsl-test -# -#echo -e "$echoPrefix cd $kls_source_path $echoSuffix" -#cd $kls_source_path -#echo -e "$echoPrefix git checkout -b release/test kls/release/test $echoSuffix" -#git checkout -b release/test kls/release/test || true -#echo -e "$echoPrefix git checkout release/test $echoSuffix" -#git checkout release/test -#echo -e "$echoPrefix git pull kls release/test:release/test -f $echoSuffix" -#git pull kls release/test:release/test -f -# -#echo -e "$echoPrefix git push dsl release/test:release/test -f $echoSuffix" -#git push dsl release/test:release/test -f -#echo "" -#echo "接下来:登录大参林能笑平台,等待构建完成,手动部署应用。[$(date +%Y-%m-%d' '%H:%M:%S)]" - -echo "维护中,请稍候..." +source_pull +target_pull +source_build +target_pull +sync_files +target_build +commit_target + +cmd=$1 +kls_source_path=/home/www/sync_code/sd_dsl/wms85std-sd-dsl-test + +echo -e "$echoPrefix cd $kls_source_path $echoSuffix" +cd $kls_source_path +echo -e "$echoPrefix git checkout -b release/test kls/release/test $echoSuffix" +git checkout -b release/test kls/release/test || true +echo -e "$echoPrefix git checkout release/test $echoSuffix" +git checkout release/test +echo -e "$echoPrefix git pull kls release/test:release/test -f $echoSuffix" +git pull kls release/test:release/test -f + +echo -e "$echoPrefix git push dsl release/test:release/test -f $echoSuffix" +git push dsl release/test:release/test -f +echo "" +echo "接下来:登录大参林能笑平台,等待构建完成,手动部署应用。[$(date +%Y-%m-%d' '%H:%M:%S)]" + +#echo "维护中,请稍候..." # bash <(curl -s http://git.yvanui.com/lizhiwei/jztd-deploy/raw/master/dsl/004sync_code_test.sh) diff --git a/dsl/005sync_code_test_tmp.sh b/dsl/005sync_code_test_tmp.sh index ad40a79..0193928 100644 --- a/dsl/005sync_code_test_tmp.sh +++ b/dsl/005sync_code_test_tmp.sh @@ -194,28 +194,30 @@ commit_target() { git push origin $target_branch } -source_pull -target_pull -source_build -target_pull -sync_files -target_build -commit_target - -kls_source_path=/home/www/sync_code/sd_dsl/wms85std-sd-dsl-prod - -echo -e "$echoPrefix cd $kls_source_path $echoSuffix" -cd $kls_source_path -echo -e "$echoPrefix git checkout -b release/prod kls/release/prod $echoSuffix" -git checkout -b release/prod kls/release/prod || true -echo -e "$echoPrefix git checkout release/prod $echoSuffix" -git checkout release/prod -echo -e "$echoPrefix git pull kls release/prod:release/prod -f $echoSuffix" -git pull kls release/prod:release/prod -f - -echo -e "$echoPrefix git push dsl release/prod:release/prod -f $echoSuffix" -git push dsl release/prod:release/prod -f -echo "" -echo "接下来:登录大参林能笑平台,等待构建完成,手动部署应用。[$(date +%Y-%m-%d' '%H:%M:%S)]" +#source_pull +#target_pull +#source_build +#target_pull +#sync_files +#target_build +#commit_target +# +#kls_source_path=/home/www/sync_code/sd_dsl/wms85std-sd-dsl-prod +# +#echo -e "$echoPrefix cd $kls_source_path $echoSuffix" +#cd $kls_source_path +#echo -e "$echoPrefix git checkout -b release/prod kls/release/prod $echoSuffix" +#git checkout -b release/prod kls/release/prod || true +#echo -e "$echoPrefix git checkout release/prod $echoSuffix" +#git checkout release/prod +#echo -e "$echoPrefix git pull kls release/prod:release/prod -f $echoSuffix" +#git pull kls release/prod:release/prod -f +# +#echo -e "$echoPrefix git push dsl release/prod:release/prod -f $echoSuffix" +#git push dsl release/prod:release/prod -f +#echo "" +#echo "接下来:登录大参林能笑平台,等待构建完成,手动部署应用。[$(date +%Y-%m-%d' '%H:%M:%S)]" + +echo "运维专用!!!" # bash <(curl -s http://git.yvanui.com/lizhiwei/jztd-deploy/raw/master/dsl/005sync_code_test_tmp.sh)