From 4ef08fed5a4cea3eca329b142b8349e8fb27ae5c Mon Sep 17 00:00:00 2001
From: Zexi Li <lizexi@yunionyun.com>
Date: Thu, 21 Mar 2019 20:18:51 +0800
Subject: [PATCH] fix conflict of drone config

---
 .drone.yml | 59 +++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 18 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 4ac2081d6e..cfb684a334 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,27 +1,50 @@
+---
+kind: pipeline
+name: build
+
 workspace:
   base: /go
   path: src/yunion.io/x/onecloud
 
-branches: [ release/*, ci/* ]
+steps:
+- name: build
+  image: d3lx/golang:yunion
+  commands:
+  - make
+  when:
+    event:
+    - pull_request
+    - tag
 
-clone:
-  git:
-    image: plugins/git
-    tags: true
+trigger:
+  event:
+  - pull_request
+  - tag
 
-pipeline:
-  build:
-    image: d3lx/golang:yunion
-    commands:
-      - make
+---
+kind: pipeline
+name: release
 
-  release-img:
-    image: plugins/docker
+steps:
+- name: release-img
+  image: plugins/docker
+  settings:
     repo: registry.cn-beijing.aliyuncs.com/yunionio/onecloud
     registry: registry.cn-beijing.aliyuncs.com
-    mirror: https://lms7sxqp.mirror.aliyuncs.com
-    secrets: [ docker_username, docker_password  ]
-    tags:
-      - "${DRONE_TAG}"
-    when:
-      event: tag
+    tags: "{DRONE_TAG}"
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+  when:
+    event:
+    - tag
+
+trigger:
+  event:
+  - tag
+  status:
+  - success
+
+depends_on:
+- build