Update start.sh

start.sh

@@ -5,59 +5,57 @@ seetaas_workspace=$base_workspace/seetaas #打包工作目录中的子目录seet
 archive_package_workspace=/data/archive   #打包后压缩归档路径
 archive_package_workspace=/data/archive   #打包后压缩归档路径
 date=date+%F-%M-%D-%S
 date=date+%F-%M-%D-%S
 go_proxy_server=http://goproxy.seetatech.com
 go_proxy_server=http://goproxy.seetatech.com
-autodl_core_branch=master
-kpl_frontend_branch=master
-kpl_backend_branch=master
-kpl_stream_branch=master
-kpl_launcher_branch=master
 
 
 
 
 
 
-sed_proxy()
-{
-find $workspace/$date -maxdepth 3  -type f -name Makefile |xargs sed -i s@go_proxy_server@$go_proxy_server@g
-}
-
+seetaas_deploy_archive=$1
+private_apt_debs=$2
+configmap_kpl_archive=$3
+private_images_archive=$4
+autodl_core_branch=$5
+kpl_frontend_branch=$6
+kpl_backend_branch=$7
+kpl_stream_branch=$8
+kpl_launcher_branch=$9
 
 
 
 
-kpl_frontend(){
-echo "清空旧的工作空间"
-rm -rf  $base_package_workspace
-echo "拉取kpl前端的$kpl_frontend_branch 分支k,并且编译"
-git clone -b $kpl_frontend_branch  git@gitlab.seetatech.com:seetaas/seetaas-v3.git $workspace/$date/seetaas-v3 && cd $workspace/$date/seetaas-v3/ && export GOPATH=$workspace/$date &&sed_proxy &&  make build mode=dev
+sed_proxy()
+{
+find $seetaas_workspace -maxdepth 3  -type f -name Makefile |xargs sed -i s@go_proxy_server@$go_proxy_server@g
 }
 }
 
 
-
-
+autodl_core(){
+echo "清空seetaas旧的工作空间"
+rm -rf $seetaas_workspace
 echo "为后端创建src目录"
 echo "为后端创建src目录"
 test -d $seetaas_workspace/src || mkdir $seetaas_workspace/src/ -pv
 test -d $seetaas_workspace/src || mkdir $seetaas_workspace/src/ -pv
-
-
-echo "拉取master 分支 seetaas-v3前端代码,并且编译"
-git clone -b master  git@gitlab.seetatech.com:seetaas/seetaas-v3.git $workspace/$date/seetaas-v3 && cd $workspace/$date/seetaas-v3/ && export GOPATH=$workspace/$date &&sed_proxy &&  make build mode=dev
-
-
-
 echo "拉取 autodl-core代码,并且编译"
 echo "拉取 autodl-core代码,并且编译"
-git clone -b  master  git@gitlab.seetatech.com:autodl.com/autodl-core.git $workspace/$date/src/autodl-core && cd $workspace/$date/src/autodl-core/ && export GOPATH=$workspace/$date && sed_proxy && make build mode=dev ||echo "重新尝试" && make build mode=dev  
+git clone -b  master  git@gitlab.seetatech.com:autodl.com/autodl-core.git $seetaas_workspace/src/autodl-core && cd $seetaas_workspace/src/autodl-core/ && export GOPATH=$seetaas_workspace && sed_proxy && make build mode=dev ||echo "重新尝试" && make build mode=dev
+}
 
 
+kpl_frontend(){
+echo "拉取kpl前端的$kpl_frontend_branch 分支,并且编译"
+git clone -b  $kpl_frontend_branch   git@gitlab.seetatech.com:seetaas/seetaas-v3.git $seetaas_workspace/seetaas-v3 && cd $seetaas_workspace/seetaas-v3/ && export GOPATH=$seetaas_workspace && sed_proxy &&  make build mode=dev
+}
 
 
+kpl_backend(){
 echo "拉取master 分支 seetaas-backend代码,并且编译"
 echo "拉取master 分支 seetaas-backend代码,并且编译"
-git clone -b  master   git@gitlab.seetatech.com:seetaas.com/seetaas-backend.git $workspace/$date/src/seetaas-backend && cd $workspace/$date/src/seetaas-backend/ && export GOPATH=$workspace/$date && sed_proxy && make build mode=dev || echo "重新尝试" && rm -rf $workspace/$date/pkg && make build mode=dev
-
-echo "拉取master 分支 kpl-stream代码,并且编译"
-git clone -b master  git@gitlab.seetatech.com:seetaas.com/kpl-stream.git  $workspace/$date/src/kpl-stream && cd $workspace/$date/src/kpl-stream/ && export GOPATH=$workspace/$date && sed_proxy && make build mode=dev || echo "重新尝试" && rm -rf $workspace/$date/pkg && make build mode=dev
+git clone -b  master   git@gitlab.seetatech.com:seetaas.com/seetaas-backend.git $seetaas_workspace/src/seetaas-backend && cd $seetaas_workspace/src/seetaas-backend/ && export GOPATH=$seetaas_workspace && sed_proxy && make build mode=dev || echo "重新尝试" && rm -rf $seetaas_workspace/pkg && make build mode=dev
+}
 
 
 
 
+kpl_stream(){
+echo "拉取master 分支 kpl-stream代码,并且编译"
+git clone -b master  git@gitlab.seetatech.com:seetaas.com/kpl-stream.git  $seetaas_workspace/src/kpl-stream && cd $seetaas_workspace/src/kpl-stream/ && export GOPATH=$seetaas_workspace && sed_proxy && make build mode=dev || echo "重新尝试" && rm -rf $seetaas_workspace/pkg && make build mode=dev
+}
 
 
+kpl_launcher(){
 echo "拉取master 分支 kpl-launcher代码,并且编译"
 echo "拉取master 分支 kpl-launcher代码,并且编译"
-git clone -b master git@gitlab.seetatech.com:tingweiwang/kpl-launcher.git  $workspace/$date/src/kpl-launcher
-
-
-
+git clone -b master git@gitlab.seetatech.com:tingweiwang/kpl-launcher.git  $seetaas_workspace/src/kpl-launcher
+}
 
 
 private_img(){
 private_img(){
-wget https://2019-10-1.oss-cn-huhehaote.aliyuncs.com/private_images/images.tar.gz
+wget https://2019-10-1.oss-cn-huhehaote.aliyuncs.com/private_images/images.tar.gz -p
 }
 }
 
 
 configmap_kpl(){
 configmap_kpl(){
@@ -66,6 +64,7 @@ git clone git@gitlab.seetatech.com:tingweiwang/configmap-kpl.git
 
 
 seetaas_deploy(){
 seetaas_deploy(){
 git clone git@gitlab.seetatech.com:tingweiwang/seetaas-deploy.git
 git clone git@gitlab.seetatech.com:tingweiwang/seetaas-deploy.git
-
-
+}
+private_debs(){
+wget https://2019-10-1.oss-cn-huhehaote.aliyuncs.com/private_debs/apt-1804/debs-apt-1804.tar.gz -P
 }
 }
\ No newline at end of file