Skip to content

Commit

Permalink
Ensure ordering of deploy-all/delete-all errands.
Browse files Browse the repository at this point in the history
deploy-all should be the first post-deploy errand.
delete-all should be the last pre-delete errand.
  • Loading branch information
mboldt committed Jun 4, 2019
1 parent 5f8cec1 commit bef5bab
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions tile_generator/tile_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -701,8 +701,16 @@ def _build_errands(self):
errand = dict()
if job.get('lifecycle') == 'errand':
errand['name'] = job['name']
if job.get('post_deploy'): post_deploy_errands.append(errand)
if job.get('pre_delete'): pre_delete_errands.append(errand)
if job.get('post_deploy'):
if job.get('type') == 'deploy-all': # deploy-all should run first.
post_deploy_errands.insert(0, errand)
else:
post_deploy_errands.append(errand)
if job.get('pre_delete'): # delete-all should run last.
if job.get('type') == 'delete-all':
pre_delete_errands.append(errand)
else:
pre_delete_errands.insert(0, errand)
for template in job.get('templates', {}):
errand = {'colocated': True}
# TODO: This should all really be checked in Cerberus for validation!
Expand Down

0 comments on commit bef5bab

Please sign in to comment.