Fix drone CI builds for loki operator (grafana#6599)

esev · Jul 7, 2022 · 1b8f609 · 1b8f609
1 parent 9590e5c
commit 1b8f609
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 47 deletions.
diff --git a/.drone/drone.jsonnet b/.drone/drone.jsonnet
@@ -287,12 +287,12 @@ local lambda_promtail(arch) = pipeline('lambda-promtail-' + arch) + arch_image(a
   depends_on: ['check'],
 };
 
-local lokiopertor(arch) = pipeline('lokioperator-' + arch) + arch_image(arch) {
+local lokioperator(arch) = pipeline('lokioperator-' + arch) + arch_image(arch) {
   steps+: [
     // dry run for everything that is not tag or main
     docker_operator(arch, 'loki-operator') {
       depends_on: ['image-tag'],
-      when: condition('exclude').tagMain,
+      when: onPRs,
       settings+: {
         dry_run: true,
       },
@@ -301,7 +301,7 @@ local lokiopertor(arch) = pipeline('lokioperator-' + arch) + arch_image(arch) {
     // publish for tag or main
     docker_operator(arch, 'loki-operator') {
       depends_on: ['image-tag'],
-      when: condition('include').tagMain,
+      when: onTagOrMain,
       settings+: {},
     },
   ],
@@ -535,7 +535,7 @@ local manifest_ecr(apps, archs) = pipeline('manifest-ecr') {
   )
   for arch in archs
 ] + [
-  lokiopertor(arch)
+  lokioperator(arch)
   for arch in archs
 ] + [
   fluentbit(),

diff --git a/.drone/drone.yml b/.drone/drone.yml
@@ -715,11 +715,8 @@ steps:
     username:
       from_secret: docker_username
   when:
-    ref:
-      exclude:
-      - refs/heads/main
-      - refs/heads/k???
-      - refs/tags/v*
+    event:
+    - pull_request
 - depends_on:
   - image-tag
   image: plugins/docker
@@ -733,16 +730,15 @@ steps:
     username:
       from_secret: docker_username
   when:
-    ref:
-      include:
-      - refs/heads/main
-      - refs/heads/k???
-      - refs/tags/v*
+    event:
+    - push
+    - tag
 trigger:
-  event:
-  - push
-  - pull_request
-  - tag
+  ref:
+  - refs/heads/main
+  - refs/heads/k???
+  - refs/tags/v*
+  - refs/pull/*/head
 ---
 depends_on:
 - check
@@ -771,11 +767,8 @@ steps:
     username:
       from_secret: docker_username
   when:
-    ref:
-      exclude:
-      - refs/heads/main
-      - refs/heads/k???
-      - refs/tags/v*
+    event:
+    - pull_request
 - depends_on:
   - image-tag
   image: plugins/docker
@@ -789,16 +782,15 @@ steps:
     username:
       from_secret: docker_username
   when:
-    ref:
-      include:
-      - refs/heads/main
-      - refs/heads/k???
-      - refs/tags/v*
+    event:
+    - push
+    - tag
 trigger:
-  event:
-  - push
-  - pull_request
-  - tag
+  ref:
+  - refs/heads/main
+  - refs/heads/k???
+  - refs/tags/v*
+  - refs/pull/*/head
 ---
 depends_on:
 - check
@@ -827,11 +819,8 @@ steps:
     username:
       from_secret: docker_username
   when:
-    ref:
-      exclude:
-      - refs/heads/main
-      - refs/heads/k???
-      - refs/tags/v*
+    event:
+    - pull_request
 - depends_on:
   - image-tag
   image: plugins/docker
@@ -845,16 +834,15 @@ steps:
     username:
       from_secret: docker_username
   when:
-    ref:
-      include:
-      - refs/heads/main
-      - refs/heads/k???
-      - refs/tags/v*
+    event:
+    - push
+    - tag
 trigger:
-  event:
-  - push
-  - pull_request
-  - tag
+  ref:
+  - refs/heads/main
+  - refs/heads/k???
+  - refs/tags/v*
+  - refs/pull/*/head
 ---
 depends_on:
 - check
@@ -1423,6 +1411,6 @@ kind: secret
 name: deploy_config
 ---
 kind: signature
-hmac: 340c892b7147c1735d4a8a8aadbae154a5633484bcf99c7fbf9453726afe9b96
+hmac: 2082d23dcc8f69038e55b027f55a8b1fe8bc52b27f07d785db781fc935a434ad
 
 ...