Ticket #99: Queue.diff

buildbot-0.7.8-orig/buildbot/process/builder.py

@@ -333 +333 @@
-    def __repr__(self):
-        return "<Builder '%s' at %d>" % (self.name, id(self))
-
-
+
-    def submitBuildRequest(self, req):
+        for breq in self.buildable:
+            if breq == req:
+                # Check if install_set is on and languages equal
+                # This is an ugly hack!!!
+                if req.properties.has_key('install_set') and breq.properties.has_key('install_set') and \
+                    req.properties.has_key('languages') and breq.properties.has_key('languages'):
+                    if breq.properties['languages'] == req.properties['languages'] and \
+                        breq.properties['install_set'] == req.properties['install_set']:
+                        print "DEBUG: Build %s skipped!" % req
+                        return
+                    else:
+                        # Enable install_set
+                        breq.properties['install_set'] = 'on' 
+                        print "DEBUG: Build %s merged!" % req
+                        return                  
+                else:
+                    print "DEBUG: Build %s skipped!" % req
+                    return
+        
-        req.submittedAt = now()
-        self.buildable.append(req)
-        req.requestSubmitted(self)
-        self.builder_status.addBuildRequest(req.status)
-        self.maybeStartBuild()
+        return
-
-    def cancelBuildRequest(self, req):
-        if req in self.buildable:
@@ -714 +734 @@
-            return
-
-        ss = bs.getSourceStamp(absolute=True)
-
+
+
+
+
-        self.requestBuild(req)
-
-    def getPendingBuilds(self):
-
-
+
+
+
+
+
-
-    def getBuild(self, number):
-        return self.original.getBuild(number)

buildbot-0.7.8-orig/buildbot/process/properties.py

@@ -39 +39 @@
-
-    def __getitem__(self, name):
-        """Just get the value for this property."""
-
-
+
+
+
+
+
+
+
-
-    def has_key(self, name):
-        return self.properties.has_key(name)

buildbot-0.7.8-orig/buildbot/status/web/baseweb.py

@@ -20 +20 @@
-from buildbot.status.web.slaves import BuildSlavesResource
-from buildbot.status.web.xmlrpc import XMLRPCServer
-from buildbot.status.web.about import AboutBuildbot
+from buildbot.status.web.queue import QueueStatusResource
-
-# this class contains the status services (WebStatus and the older Waterfall)
-# which can be put in c['status']. It also contains some of the resources

buildbot-0.7.8-orig/buildbot/status/web/builder.py

@@ -9 +9 @@
-from buildbot.status.web.base import HtmlResource, make_row, \
-     make_force_build_form, OneLineMixin
-from buildbot.process.base import BuildRequest
+from buildbot.process.properties import Properties
-from buildbot.sourcestamp import SourceStamp
-from buildbot import version, util
-
@@ -50 +51 @@
-  <input type="submit" value="Stop Build" />
-</form>''' % stopURL
-        return data
+    
+    def makeRemoveFromQueueButton(self, req, buildnum):
+        stopURL = urllib.quote(req.childLink("builds/%d/remove" % buildnum))
+        data = '''
+<form action="%s" class="command stopbuild" style="display:inline">
+  <input type="submit" value="Remove Build" />
+</form>''' % stopURL
+        return data
-
-    def body(self, req):
-        b = self.builder_status
@@ -76 +85 @@
-            data += "</ul>\n"
-        else:
-            data += "<h2>no current builds</h2>\n"
+            
+        # Then a section with the queued build requests
+        data += "<h2>Pending Builds:</h2>\n"
+        # Retrieve the builders queue
+        pendingBuilds = b.getPendingBuilds()
+        if pendingBuilds:
+            # Determine the build numbers of the queue builds.
+            # Sadly we cannot remove the build from the queue with this
+            # number as it is not valid yet.
+            nextBuildNumber = b.nextBuildNumber
+            data += "<ul>\n"
+            for buildRequestStatus in pendingBuilds:
+                sourceStamp = buildRequestStatus.getSourceStamp()
+                data += "<li>#%u " % nextBuildNumber
+                data += "Branch: %s " % sourceStamp.branch
+                data += "[rev=%s]" % sourceStamp.revision
+                data += self.makeRemoveFromQueueButton(req, nextBuildNumber)
+                data += "</li>"
+                nextBuildNumber += 1
+            data += "</ul>\n"
+        else:
+            data += "No pending builds"
-
-        # Then a section with the last 5 builds, with the most recent build
-        # distinguished from the rest.
@@ -190 +221 @@
-        if not revision:
-            revision = None
-
+        install_set = req.args.get("install_set", [""])[0]
+        languages   = req.args.get("languages", [""])[0]
+
+        customBuildProps = Properties()
+        customBuildProps.setProperty("install_set", install_set, "")
+        customBuildProps.setProperty("languages", languages, "")
+
-        # TODO: if we can authenticate that a particular User pushed the
-        # button, use their name instead of None, so they'll be informed of
-        # the results.
-        s = SourceStamp(branch=branch, revision=revision)
-
+, properties=customBuildProps
-        try:
-            self.builder_control.requestBuildSoon(req)
-        except interfaces.NoSlaveError:

buildbot-0.7.8-orig/buildbot/status/web/build.py

@@ -11 +11 @@
-from buildbot.status.web.tests import TestsResource
-from buildbot.status.web.step import StepsResource
-from buildbot import version, util
+from buildbot.status.web.queue import QueueStatusResource
-
-# /builders/$builder/builds/$buildnum
-class StatusResourceBuild(HtmlResource):
@@ -56 +57 @@
-            results = b.getResults()
-            data += "<h2>Results:</h2>\n"
-            text = " ".join(b.getText())
-data += '<span class="%s">%s</span>\n' % (css_classes[results],
-                                     
+if results != None:
+data += '<span class="%s">%s</span>\n' % (css_classes[results],
-            if b.getTestResults():
-                url = req.childLink("tests")
-                data += "<h3><a href=\"%s\">test results</a></h3>\n" % url
@@ -284 +285 @@
-                    build_control = None
-                return StatusResourceBuild(build_status, build_control,
-                                           self.builder_control)
+            else:
+                # Probably a build that was not started yet
+                return QueueStatusResource(path, req, num, self.builder_status, self.builder_control)
-
-        return HtmlResource.getChild(self, path, req)
-

buildbot-0.7.8-orig/buildbot/status/web/queue.py

@@ +1 @@
+from twisted.web.util import Redirect, DeferredResource
+from twisted.internet import defer, reactor
+from buildbot.status.web.base import HtmlResource
+
+# Shows the queue of a Builder
+class QueueStatusResource(HtmlResource):
+    def __init__(self, path, req, num, builder_status, builder_control):
+        HtmlResource.__init__(self)
+        self.path = path
+        self.req  = req
+        self.num  = num
+        self.builder_status = builder_status
+        self.builder_control = builder_control
+        
+    def body(self, request):    
+        return ""
+    
+    # Removes a build from a builders queue
+    def removeFromQueue(self, req):
+        # Delete the build request from queue
+        idx = self.builder_status.nextBuildNumber - self.num
+        
+        if idx >= 0:
+            buildables = self.builder_control.getPendingBuilds()
+            buildables[idx].cancel()
+
+        # we're at http://localhost:8080/svn-hello/builds/5/stop?[args] and
+        # we want to go to: http://localhost:8080/svn-hello
+        r = Redirect("../..")
+        d = defer.Deferred()
+        reactor.callLater(1, d.callback, r)
+        return DeferredResource(d)
+        
+    def getChild(self, path, req):
+        if path == "remove":
+            return self.removeFromQueue(req)
+        else:
+            return HtmlResource.getChild(self, path, req)
+        

buildbot-0.7.8-orig/buildbot/status/web/waterfall.py

@@ -129 +129 @@
-        number = b.getNumber()
-        url = path_to_build(req, b)
-        reason = b.getReason()
-
-
+
+
+
+
+
+
+
+
+
-        color = "yellow"
-        class_ = "start"
-        if b.isFinished() and not b.getSteps():