robert 1 год назад
Родитель
Сommit
73b3e384c3
1 измененных файлов с 33 добавлено и 23 удалено
  1. 33 23
      .drone.yml

+ 33 - 23
.drone.yml

@@ -5,6 +5,7 @@ name: eavideo-admin
 clone:
   disable: true
 
+
 metadata:
   namespace: ci
 
@@ -14,44 +15,53 @@ steps:
    commands:
    - git clone --depth=1 $DRONE_GIT_HTTP_URL .
 
+ - name: build
+   image: plugins/docker
+   settings:
+     username: admin
+     password: Easou2)1*
+     insecure: true
+     custom_dns: 223.5.5.5
+     mirror: https://ci7pm4nx.mirror.aliyuncs.com
+     registry: hub.evbj.easou.com
+     repo: hub.evbj.easou.com/rec/${DRONE_REPO_NAME}
+     tag: v1.1.75
+     
  - name: deployment
    image: hub.evbj.easou.com/dev/drone-agent:v3.0.1-230721
    pull: always
+   # privileged: true
    environment:
      JNLP_ENV: rec
-     #JNLP_REPLICAS: 2
-     #JNLP_TAG: v3.0.0
-     #JNLP_VERSION: v1  # default v1, v2 for canary
-     DEPLOY_ENV: k8s-4 # 可以选择把应用部署到集群:k8s-1(阿里云) or k8s-2(青岛IDC机房)or k8s-4(济南IDC机房)
-     #JNLP_REPO: hub.evbj.easou.com
-     #JNLP_CONTAINER_PORT: 8080
+     JNLP_REPLICAS: 1
+     JNLP_TAG: v1.0.0
+     JNLP_VERSION: v1  # default v1, v2 for canary
+     DEPLOY_ENV: k8s-4 # 可以选择把应用部署到集群:k8s-1 or k8s-2 or k8s-4
+     JNLP_REPO: hub.evbj.easou.com
+     JNLP_CONTAINER_PORT: 6005
      JNLP_INGRESS: nginx
      JNLP_SVC_MODE: http
-     #JNLP_STORAGE_CLASS: rbd   #k8s-2的STORAGE_CLASS为: rbd; k8s-1的STORAGE_CLASS为: ceph-block
+     JNLP_STORAGE_CLASS: rbd
      JNLP_DOMAIN: .ieasou.cn
-     #JNLP_CONTROL: StatefulSet
-     #JNLP_STORAGE_CAPACITY: 200Gi
-     #JNLP_MOUNT_PATH: /data
-     #JNLP_LIVENESS_INIT: 45
-     #JNLP_LIVENESS_PER: 15
-     #JNLP_READINESS_INIT: 45
-     #JNLP_READINESS_PER: 15
-     JNLP_INGRESS_PUB: yes
+     JNLP_CONTROL: Deployment
+     JNLP_STORAGE_CAPACITY: 1Gi
+     JNLP_MOUNT_PATH: /data
+     JNLP_LIVENESS_INIT: 30
+     JNLP_LIVENESS_PER: 15
+     JNLP_READINESS_INIT: 30
+     JNLP_READINESS_PER: 15
+     JNLP_INGRESS_PUB: no
    commands:
      # 切换目标集群
      - kubecm s $DEPLOY_ENV
      # 生成配置YAML文件
-     # - python3 /root/tools.py -b
+     - python3 /root/tools.py -b
      # 部署服务到kubernetes上
-     # - python3 /root/tools.py -a
-     # apply for prod
-     - kubectl apply -f deploy.yaml --record
-     # apply for canary
-     #- kubectl apply -f deploy-canary.yaml --record
+     - python3 /root/tools.py -a
      # 检查服务部署状态
-     # - python3 /root/tools.py -c
+     #- python3 /root/tools.py -c
      # 添加dns解析记录,生成访问域名
-     #- python3 /root/tools.py -d
+     # - python3 /root/tools.py -d
 
  - name: success
    image: hub.evbj.easou.com/dev/drone-wechat:20200622