Merge lp:~allanlesage/helipad/fix-for-stale-data into lp:helipad/ci

[Allan LeSage]

Fix for stale data in jenkins_pull_ci.

Fix for stale data.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:23
http://s-jenkins:8080/job/helipad-ci-ci/38/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/helipad-ci-ci/38/rebuild

review: Approve (continuous-integration)

[Chris Johnston (cjohnston)]

review: Approve

[Chris Johnston (cjohnston)]

I think you could have done it similar to http://paste.ubuntu.com/5915231/ and performed less queries.

=== modified file 'management/commands/jenkins_pull_ci.py'
--- management/commands/jenkins_pull_ci.py	2013-07-22 15:17:41 +0000
+++ management/commands/jenkins_pull_ci.py	2013-07-25 17:43:25 +0000
@@ -23,7 +23,7 @@
 from ci.util.cu2d_stack import create_cu2d_stack_from_config
 from ci.util.ci_project import create_ci_project
 from ci.util.jenkins_job import update_jenkins_job
-from ci.models import CiProject
+from ci.models import CiProject, JenkinsJob
 
 from common.management import JenkinsBaseCommand, jenkins_get
 
@@ -99,11 +99,17 @@
         (release, config, extension) = parts[-1].split('.')
         return (release, config)
 
-    def update_projects(self, project_list=None):
-        if project_list is None:
+    def update_projects(self, project_list=[]):
+        # TODO error handling if project not found
+        if len(project_list) == 0:
             project_list = CiProject.objects.all()
-        for project in project_list:
-            update_jenkins_job(project.jenkins_job)
+        else:
+            project_list = CiProject.objects.filter(
+                launchpad_project__name__in=project_list)
+        jenkins_jobs = JenkinsJob.objects.filter(
+            project__in=project_list)
+        for jenkins_job in jenkins_jobs:
+            update_jenkins_job(jenkins_job)
 
     def _load_artifact(self, url):
         page = jenkins_get(url, as_json=False)