Merge "utils: fix yamllint issues"

[releng.git] / jjb / infra / bifrost-cleanup-job.yml

diff --git a/jjb/infra/bifrost-cleanup-job.yml b/jjb/infra/bifrost-cleanup-job.yml
index ba283ff..571e275 100644 (file)
--- a/jjb/infra/bifrost-cleanup-job.yml
+++ b/jjb/infra/bifrost-cleanup-job.yml
@@ -67,7 +67,7 @@
             fi
             # No force (-f). We always verify upstream jobs so if there are no logs
             # something else went wrong and we need to break immediately and investigate
-            gsutil rm -r $BIFROST_GS_URL
+            gsutil -m rm -r $BIFROST_GS_URL
 
     triggers:
         - '{project}-gerrit-trigger-cleanup':
@@ -86,13 +86,9 @@
             server-name: 'review.openstack.org'
             escape-quotes: true
             trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
+                # We only run this when the change is merged or
+                # abandoned since we don't need the logs anymore
                 - patchset-uploaded-event: 'false'
-                # We only run this when the change is merged since
-                # we don't need the logs anymore
                 - change-merged-event: 'true'
                 - change-abandoned-event: 'true'
                 - change-restored-event: 'false'
@@ -107,11 +103,13 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
+                disable-strict-forbidden-file-verification: 'true'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'doc/**'
                   - compare-type: ANT
                     pattern: 'releasenotes/**'
+                disable-strict-forbidden-file-verification: 'true'
             readable-message: true
 - trigger:
     name: 'opnfv-gerrit-trigger-cleanup'
@@ -119,13 +117,9 @@
         - gerrit:
             server-name: 'gerrit.opnfv.org'
             trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
+                # We only run this when the change is merged or
+                # abandoned since we don't need the logs anymore
                 - patchset-uploaded-event: 'false'
-                # We only run this when the change is merged since
-                # we don't need the logs anymore
                 - change-merged-event: 'true'
                 - change-abandoned-event: 'true'
                 - change-restored-event: 'false'
@@ -143,6 +137,4 @@
                 file-paths:
                   - compare-type: ANT
                     pattern: 'prototypes/bifrost/**'
-                  - compare-type: ANT
-                    pattern: 'jjb/infra/**'
             readable-message: true