root hace 2 años
padre
commit
918e09863b
Se han modificado 2 ficheros con 92 adiciones y 34 borrados
  1. 2 34
      .drone.yml
  2. 90 0
      .drone.yml.bak

+ 2 - 34
.drone.yml

@@ -14,41 +14,9 @@ steps:
    commands:
    - git clone --depth=1 $DRONE_GIT_HTTP_URL .
 
- - name: build
-   image: plugins/docker
-   settings:
-     username: admin
-     password: Easou2)1*
-     insecure: true
-     mirror: https://ci7pm4nx.mirror.aliyuncs.com
-     registry: hub.evbj.easou.com
-     repo: hub.evbj.easou.com/op/${DRONE_REPO_NAME}
-     tag: v3.0.0
-     
  - name: deployment
-   image: hub.evbj.easou.com/dev/drone-agent:v3.0.0
+   image: hub.evbj.easou.com/dev/drone-agent:v3.0.1
    pull: always
-   # privileged: true
-   environment:
-     JNLP_ENV: op
-     JNLP_REPLICAS: 2
-     JNLP_TAG: v3.0.0
-     JNLP_VERSION: v1  # default v1, v2 for canary
-     DEPLOY_ENV: k8s-2 # 可以选择把应用部署到集群:k8s-1(阿里云) or k8s-2(IDC机房)
-     JNLP_REPO: hub.evbj.easou.com
-     JNLP_CONTAINER_PORT: 8080
-     JNLP_INGRESS: nginx
-     JNLP_SVC_MODE: http
-     JNLP_STORAGE_CLASS: rbd   #k8s-2的STORAGE_CLASS为: rbd; k8s-1的STORAGE_CLASS为: ceph-block
-     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
    commands:
      # 切换目标集群
      - kubecm s $DEPLOY_ENV
@@ -57,7 +25,7 @@ steps:
      # 部署服务到kubernetes上
      - python3 /root/tools.py -a
      # 检查服务部署状态
-     - python3 /root/tools.py -c
+     # - python3 /root/tools.py -c
      # 添加dns解析记录,生成访问域名
      - python3 /root/tools.py -d
 

+ 90 - 0
.drone.yml.bak

@@ -0,0 +1,90 @@
+kind: pipeline
+type: kubernetes
+name: book-api
+
+clone:
+  disable: true
+
+metadata:
+  namespace: drone
+
+steps:
+ - name: clone
+   image: hub.evbj.easou.com/dev/alpine-git:20200622
+   commands:
+   - git clone --depth=1 $DRONE_GIT_HTTP_URL .
+
+ - name: build
+   image: plugins/docker
+   settings:
+     username: admin
+     password: Easou2)1*
+     insecure: true
+     mirror: https://ci7pm4nx.mirror.aliyuncs.com
+     registry: hub.evbj.easou.com
+     repo: hub.evbj.easou.com/op/${DRONE_REPO_NAME}
+     tag: v3.0.0
+     
+ - name: deployment
+   image: hub.evbj.easou.com/dev/drone-agent:v3.0.0
+   pull: always
+   # privileged: true
+   environment:
+     JNLP_ENV: op
+     JNLP_REPLICAS: 2
+     JNLP_TAG: v3.0.0
+     JNLP_VERSION: v1  # default v1, v2 for canary
+     DEPLOY_ENV: k8s-2 # 可以选择把应用部署到集群:k8s-1(阿里云) or k8s-2(IDC机房)
+     JNLP_REPO: hub.evbj.easou.com
+     JNLP_CONTAINER_PORT: 8080
+     JNLP_INGRESS: nginx
+     JNLP_SVC_MODE: http
+     JNLP_STORAGE_CLASS: rbd   #k8s-2的STORAGE_CLASS为: rbd; k8s-1的STORAGE_CLASS为: ceph-block
+     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
+   commands:
+     # 切换目标集群
+     - kubecm s $DEPLOY_ENV
+     # 生成配置YAML文件
+     - python3 /root/tools.py -b
+     # 部署服务到kubernetes上
+     - python3 /root/tools.py -a
+     # 检查服务部署状态
+     - python3 /root/tools.py -c
+     # 添加dns解析记录,生成访问域名
+     - python3 /root/tools.py -d
+
+ - name: success
+   image: hub.evbj.easou.com/dev/drone-wechat:20200622
+   settings:
+     corpid: ww419ee4063735e1c0
+     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
+     agent_id: 1000004
+     title: "Pipeline ${DRONE_REPO_NAME} Success"
+     description: "${DRONE_BUILD_LINK} 部署完成"
+     msg_url: ${DRONE_BUILD_LINK}
+     btn_txt: "否"
+   when:
+     status:
+     - success
+
+ - name: failure
+   image: hub.evbj.easou.com/dev/drone-wechat:20200622
+   settings:
+     corpid: ww419ee4063735e1c0
+     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
+     agent_id: 1000004
+     title: "Pipeline ${DRONE_REPO_NAME} Failure"
+     description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!"
+     msg_url: ${DRONE_BUILD_LINK}
+     btn_txt: "否"
+   when:
+     status:
+     - failure