3 commits - bodhi/jobs.py bodhi.spec

[Luke Macken]

bodhi.spec    |    2 +-
 bodhi/jobs.py |   14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 69cdf9f118edd5c456c3e7087b42bd4725857a58
Author: Luke Macken 
Date:   Fri Aug 13 20:11:08 2010 -0400

0.7.8.1 masher bugfix release

diff --git a/bodhi.spec b/bodhi.spec
index fcc9020..ac04a6a 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -2,7 +2,7 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           bodhi
-Version:        0.7.8
+Version:        0.7.8.1
 Release:        1%{?dist}
 Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet

commit 76a7020224fc70b93bfede169949605324d2a963
Author: Luke Macken 
Date:   Fri Aug 13 20:10:16 2010 -0400

Run the approve_testing_updates job every 6 hours

diff --git a/bodhi/jobs.py b/bodhi/jobs.py
index 4e2e57a..d6cda39 100644
--- a/bodhi/jobs.py
+++ b/bodhi/jobs.py
@@ -242,6 +242,9 @@ def schedule():
     # Approve updates that have been in testing for a certain amount of time
     if 'approve_testing_updates' in jobs:
         log.debug("Scheduling approve_testing_updates job")
-        scheduler.add_weekday_task(action=approve_testing_updates,
-                                   weekdays=range(1,8),
-                                   timeonday=(0,0))
+        scheduler.add_interval_task(action=approve_testing_updates,
+                                   # Run every 6 hours
+                                   initialdelay=21600,
+                                   interval=21600)
+                                   #weekdays=range(1,8),
+                                   #timeonday=(0,0))

commit a9cad2fe694e931d2a67a432d9d03c9b31928147
Author: Luke Macken 
Date:   Fri Aug 13 20:09:37 2010 -0400

Skip critpath updates in our approve_testing_updates job, since they have seperate
    karma-based testing requirements.

diff --git a/bodhi/jobs.py b/bodhi/jobs.py
index 125b205..4e2e57a 100644
--- a/bodhi/jobs.py
+++ b/bodhi/jobs.py
@@ -183,11 +183,16 @@ def approve_testing_updates():
         # If this has already met testing requirements, skip it
         if update.met_testing_requirements:
             continue
+        # If this is a critpath update, skip it, since they have their own
+        # testing requirements, aside from spending time in testing.
+        if update.critpath:
+            continue
         if update.meets_testing_requirements:
             log.info('%s now meets testing requirements' % update.title)
             update.comment(
                 config.get('testing_approval_msg') % update.days_in_testing,
                 author='bodhi')
+    log.info('approve_testing_updates job complete.')

def schedule():