Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "xci: Do not log info to console if running daily deployment"
[releng.git]
/
jjb
/
xci
/
bifrost-cleanup-job.yml
diff --git
a/jjb/xci/bifrost-cleanup-job.yml
b/jjb/xci/bifrost-cleanup-job.yml
index
571e275
..
d4b2157
100644
(file)
--- 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
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 #$i)"
+ let try_to_rm += 1
+ # Give it some time...
+ sleep 10
+ done
+ exit $_exitcode
triggers:
- '{project}-gerrit-trigger-cleanup':
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
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
# 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
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
# This is an OPNFV maintenance job. We don't want to provide
# feedback on Gerrit
silent: true