merge test

.gitlab-ci.yml

 stages:
   - build
-  - make
+  - test
   - deploy
-
+  
 variables:
-  VERSION: "3.$CI_PIPELINE_ID"
-  BUILDDIR: "/builds"
-  LOCALDIR: "/opt/gitlab-runner/builds"
-  NAMESPACE: "srs-prd"
+  projName: "ppt-server"
 
-ppt-server-build:
-  stage: build
+before_script:
+  - source /builds/cicd/base.sh
+  
+docker-build:
   tags:
-    - test-ppt-server-shell
-  only:
-    - test
-  retry: 2
+    - ppt-server-shell
+  stage: build
+  retry: 1
   script:
-    #- GO111MODULE=auto
-    #- mkdir -p ${BUILDDIR}/ppt-server
-    #- rm -rf ${BUILDDIR}/ppt-server/*
-    #- go build -o ${BUILDDIR}/ppt-server/ppt-server
-    #- cp -f Dockerfile ${BUILDDIR}/ppt-server/
-    #- cp -rf conf ${BUILDDIR}/ppt-server/
-    #- cd ${BUILDDIR}/ppt-server/
-    - docker build -t registry.cn-beijing.aliyuncs.com/offcn_llive/ppt-server:$VERSION .
-    - docker push registry.cn-beijing.aliyuncs.com/offcn_llive/ppt-server:$VERSION
-    - docker rmi registry.cn-beijing.aliyuncs.com/offcn_llive/ppt-server:$VERSION &
-
-ppt-server-deploy:
-  stage: deploy
+    - source $PROJDIR/$projName/build.sh
+    
+k8s-deploy:
   tags:
-    - test-ppt-server-shell
-  only:
-    - test
-  retry: 2
-  before_script:
-    - CLUSTER="hb2-center"
+    - ppt-server-shell
+  stage: deploy
+  retry: 1
   script:
-    - set -x
-    - for cs in ${CLUSTER[@]};do \
-    - kubectl set image -n ${NAMESPACE} deployment/ppt-server-deployment ppt-server=registry.cn-beijing.aliyuncs.com/offcn_llive/ppt-server:$VERSION; \
-    - done
\ No newline at end of file
+    - set -xe
+    - source $PROJDIR/$projName/deploy.sh
+