X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fxci%2Fbifrost-cleanup-job.yml;h=d5a444d098823156fa3b16784a444e8f0e19c110;hb=refs%2Fchanges%2F19%2F33019%2F1;hp=571e275da4a52b272c82040260a7305c402f42b1;hpb=d3fc60f22dd0d7831f901568dc9eaa9b748b5215;p=releng.git

diff --git a/jjb/xci/bifrost-cleanup-job.yml b/jjb/xci/bifrost-cleanup-job.yml
index 571e275da..d5a444d09 100644
--- a/jjb/xci/bifrost-cleanup-job.yml
+++ b/jjb/xci/bifrost-cleanup-job.yml
@@ -65,9 +65,16 @@
                 echo "gsutil will not be executed until this is fixed!"
                 exit 1
             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 -m rm -r $BIFROST_GS_URL
+            try_to_rm=1
+            while [[ $try_to_rm -lt 6 ]]; do
+                gsutil -m rm -r $BIFROST_GS_URL && _exitcode=$? && break
+                _exitcode=$?
+                echo "gsutil rm failed! Trying again... (attempt #$try_to_rm)"
+                let try_to_rm += 1
+                # Give it some time...
+                sleep 10
+            done
+            exit $_exitcode
 
     triggers:
         - '{project}-gerrit-trigger-cleanup':
@@ -88,11 +95,8 @@
             trigger-on:
                 # We only run this when the change is merged or
                 # abandoned since we don't need the logs anymore
-                - patchset-uploaded-event: 'false'
-                - change-merged-event: 'true'
-                - change-abandoned-event: 'true'
-                - change-restored-event: 'false'
-                - draft-published-event: 'false'
+                - change-merged-event
+                - change-abandoned-event
             # This is an OPNFV maintenance job. We don't want to provide
             # feedback on Gerrit
             silent: true
@@ -119,11 +123,8 @@
             trigger-on:
                 # We only run this when the change is merged or
                 # abandoned since we don't need the logs anymore
-                - patchset-uploaded-event: 'false'
-                - change-merged-event: 'true'
-                - change-abandoned-event: 'true'
-                - change-restored-event: 'false'
-                - draft-published-event: 'false'
+                - change-merged-event
+                - change-abandoned-event
             # This is an OPNFV maintenance job. We don't want to provide
             # feedback on Gerrit
             silent: true