scofield 4 anni fa
parent
commit
2d700744ea
1 ha cambiato i file con 29 aggiunte e 14 eliminazioni
  1. 29 14
      .drone.yml

+ 29 - 14
.drone.yml

@@ -13,23 +13,35 @@ steps:
    - echo 'nameserver 10.26.22.50' > /etc/resolv.conf
    - cat /etc/resolv.conf
    - git clone $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/pro/${DRONE_REPO_NAME}
+     tag: v1.0.4
 
- - name: build
-   image: hub.evbj.easou.com/dev/drone-agent-custom:v6.0.0
-  # pull: always
-   privileged: true
+- name: deployment
+   image: hub.evbj.easou.com/dev/drone-agent:v2.0.0
+   pull: always
+   # privileged: true
    environment:
      JNLP_ENV: pro
-     JNLP_REPO: hub.evbj.easou.com
+     JNLP_REPLICAS: 3
      JNLP_TAG: v1.0.4
-     JNLP_VERSION: v1
+     JNLP_VERSION: v1  # default v1, v2 for canary
+     DEPLOY_ENV: k8s-2 # 可以选择把应用部署到集群:k8s-1 or k8s-2
+     JNLP_REPO: hub.evbj.easou.com
      JNLP_CONTAINER_PORT: 8080
      JNLP_INGRESS: nginx
      JNLP_SVC_MODE: http
      JNLP_STORAGE_CLASS: rbd
      JNLP_DOMAIN: .ieasou.cn
      JNLP_CONTROL: StatefulSet
-     JNLP_REPLICAS: 3
      JNLP_STORAGE_CAPACITY: 100Gi
      JNLP_MOUNT_PATH: /data
      JNLP_LIVENESS_INIT: 60
@@ -37,13 +49,16 @@ steps:
      JNLP_READINESS_INIT: 60
      JNLP_READINESS_PER: 10
    commands:
-     - wrapper.sh  /bin/sh
-     - docker --config /etc/docker build -t "$JNLP_REPO/$JNLP_ENV/$DRONE_REPO_NAME:$JNLP_TAG" . -f Dockerfile
-     - docker --config /etc/docker push "$JNLP_REPO/$JNLP_ENV/$DRONE_REPO_NAME:$JNLP_TAG"
-     - python tools.py -b
-     - python tools.py -a
-     - python tools.py -c
-     - python tools.py -d
+     # 切换目标集群
+     - 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