add in to crons and make sure we order ids (bug 636397)

apps/amo/cron.py

@@ -173,7 +173,8 @@ def migrate_approvals():
     a = MigrationTracker('approvals')
     id = a.get() or 0
 
-    items = Approval.objects.filter(pk__gt=id).values_list('id', flat=True)
+    items = (Approval.objects.filter(pk__gt=id).order_by('id')
+                             .values_list('id', flat=True))
 
     for chunk in chunked(items, 100):
         _migrate_approvals(chunk)

scripts/crontab/make-crons.py

@@ -38,6 +38,7 @@ for dict_ in CRONS.values():
             break
 
 
+# TODO(andym) remove migrate_approvals when zamboni editor tools are live
 cron = """\
 #
 # !!AUTO-GENERATED!!  Edit scripts/crontab/make-crons.py instead.
@@ -53,6 +54,7 @@ HOME = /tmp
 
 # Every 20 minutes.
 */20 * * * * $Z_CRON check_queues
+*/20 * * * * $Z_CRON migrate_approvals
 
 # Every 30 minutes.
 */30 * * * * $Z_CRON tag_jetpacks

scripts/crontab/preview

@@ -12,6 +12,7 @@ HOME = /tmp
 
 # Every 20 minutes.
 */20 * * * * cd /data/amo_python/src/preview/zamboni; /usr/bin/python26 manage.py cron check_queues
+*/20 * * * * cd /data/amo_python/src/preview/zamboni; /usr/bin/python26 manage.py cron migrate_approvals
 
 # Every 30 minutes.
 */30 * * * * cd /data/amo_python/src/preview/zamboni; /usr/bin/python26 manage.py cron tag_jetpacks

scripts/crontab/prod

@@ -12,6 +12,7 @@ HOME = /tmp
 
 # Every 20 minutes.
 */20 * * * * apache cd /data/amo_python/src/prod/zamboni; /usr/bin/python26 manage.py cron check_queues
+*/20 * * * * apache cd /data/amo_python/src/prod/zamboni; /usr/bin/python26 manage.py cron migrate_approvals
 
 # Every 30 minutes.
 */30 * * * * apache cd /data/amo_python/src/prod/zamboni; /usr/bin/python26 manage.py cron tag_jetpacks