Merge lp:~doanac/ubuntu-ci-services-itself/bug1283048 into lp:ubuntu-ci-services-itself

[Andy Doan]

allows the ppa-assigner to automatically keep the configured list of PPAs in sync.

We have an API for this, but we already run code in the background looking at PPAs, so lets remove the need for the user.

allows the ppa-assigner to automatically keep the configured list of PPAs in sync.

We have an API for this, but we already run code in the background looking at PPAs, so lets remove the need for the user.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:269
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/225/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/225/rebuild

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

Approve.

review: Approve

=== modified file 'ppa-assigner/ppa_assigner/management/commands/clean_ppas.py'
--- ppa-assigner/ppa_assigner/management/commands/clean_ppas.py	2014-02-19 16:34:46 +0000
+++ ppa-assigner/ppa_assigner/management/commands/clean_ppas.py	2014-02-24 19:18:02 +0000
@@ -51,6 +51,7 @@
         interval = options['interval']
         try:
             while True:
+                PPA.populate_from_launchpad()
                 self.dirty_to_cleaning()
                 self.cleaning_to_available()
                 if options['exit_early']:

=== modified file 'ppa-assigner/ppa_assigner/models.py'
--- ppa-assigner/ppa_assigner/models.py	2014-02-19 16:34:46 +0000
+++ ppa-assigner/ppa_assigner/models.py	2014-02-24 19:18:02 +0000
@@ -55,6 +55,9 @@
 
     @staticmethod
     def _merge_ppas(lp_ppas):
+        # note: LP will throttle calls to list PPAs. So you can occassionally
+        # add a PPA, and not see it update for the first few calls to this
+        # method, but it will eventually get in sync
         model_ppas = set([x.name for x in PPA.objects.all()])
         add = lp_ppas - model_ppas
         remove = model_ppas - lp_ppas
@@ -63,7 +66,7 @@
         for x in add:
             PPA.objects.create(name=x, ticket_id=0)
 
-        logging.info('removing ppas: %r', add)
+        logging.info('removing ppas: %r', remove)
         for x in remove:
             ppa = PPA.objects.get(name=x)
             if ppa.state == PPA.RESERVED: