Merge lp:~fgiff/linaro-android-bot-review/ignore-dead-builds into lp:linaro-android-bot-review

[Frans Gifford]

This prevents the bot from failing in the case that the a build has been garbage collected from Jenkins. Such a case is uncommon in normal usage, but can occur when testing against old changesets.

[Bernhard Rosenkraenzer (berolinux)]

Looks good to me, but I don't think I have the privileges to approve this

review: Approve

[Frans Gifford (fgiff)]

> Looks good to me, but I don't think I have the privileges to approve this

Right, I'll merge it myself and fix the group privileges.

[Paul Sokolovsky (pfalcon)]

Please don't forget to request this to be deployed (via ticket).

=== modified file 'androidbotreview.py'
--- androidbotreview.py	2011-11-03 03:31:16 +0000
+++ androidbotreview.py	2011-12-08 15:35:26 +0000
@@ -189,7 +189,6 @@
 #                log.debug("%s", res)
             except IOError:
                 # Failure to open the url may indicate:
-                #   Job is in the build queue
                 #   Network failure
                 #   Other (!)
                 # Either way, we ignore and will retry on next execution.
@@ -203,7 +202,9 @@
 
             # Enter build result.
             log.info("Jenkins build status: %s", res["result"])
-            if res["result"] != "SUCCESS":
+            if res["result"] == "probably deleted":
+                build_result = 0
+            elif res["result"] != "SUCCESS":
                 build_result = -1
             else:
                 build_result = 1

=== modified file 'jenkinsconnection.py'
--- jenkinsconnection.py	2011-10-31 21:28:47 +0000
+++ jenkinsconnection.py	2011-12-08 15:35:26 +0000
@@ -45,9 +45,22 @@
         return jobs
 
     def get_build_info(self, job, build):
-        url = "job/%s/%s/api/json" % (job, build)
+        # Check if build is available
+        url = "job/%s/api/json?tree=builds[number],lastStableBuild[number]" % (job)
         resp = self.request(url)
-        return json.loads(resp)
+        available_builds = json.loads(resp)
+        if [b for b in available_builds["builds"] if int(b["number"]) == int(build)]:
+            url = "job/%s/%s/api/json" % (job, build)
+            resp = self.request(url)
+            return json.loads(resp)
+        else:
+            # Build is probably queued.
+            if [b for b in available_builds["builds"] if (b != available_builds["lastStableBuild"] and int(b["number"]) < int(build))]:
+                return {"building": "building"}
+            # Build is probably deleted.
+            else: 
+                return {"building": False, "result": "probably deleted"}
+            
 
     def get_last_build_no(self, job):
         url = "job/%s/lastBuild/buildNumber" % job