Merge lp:~tom.prince/twisted-trac-integration/updated-force-builds.py into lp:twisted-trac-integration

[Tom Prince]

[Jean-Paul Calderone (exarkun)]

I guess the username/password part of this probably looks alright. But the rest of the changes are wrong. Forcing of supported builders *only* is entirely intentional.

review: Needs Fixing

[Tom Prince (tom.prince)]

This still maintains that behavior:
 + ('forcescheduler', 'force-supported'),
along with https://bazaar.launchpad.net/~tom.prince/twisted-buildbot-configuration/for-buildbot-0.8.6/view/head:/master/master.cfg#L724
    forcesched.ForceScheduler(
        name='force-supported',
        repository=forcesched.FixedParameter(name='repository', default=''),
        branch=forcesched.StringParameter(name='branch', default=''),
        project=forcesched.FixedParameter(name="project", default=""),
        properties=[],
        builderNames=[ b['name'] for b in builders if b['category'] == 'supported' ]),

means that the script still only forces supported builders.

review: Needs Resubmitting

[Itamar Turner-Trauring (itamarst)]

Sounds good, please merge.

review: Approve

[Itamar Turner-Trauring (itamarst)]

Actually, I tried it, and got a page full o' red, with some complaints about 'bzr: ERROR: Unsupported protocol for url "svn:None"', possibly there other problems. I'm not sure if that's related to this script or not.

http://buildbot.twistedmatrix.com/boxes-supported?branch=/branches/log-python3-5932-2

=== modified file 'tools/force-builds.py'
--- tools/force-builds.py	2012-04-28 12:24:04 +0000
+++ tools/force-builds.py	2012-09-03 17:23:19 +0000
@@ -8,9 +8,9 @@
 import os, sys, pwd, urllib
 
 import twisted
-from twisted.internet import reactor, defer, protocol
+from twisted.internet import reactor
 from twisted.python import log
-from twisted.web import client, http, http_headers
+from twisted.web import client, http_headers
 
 VERSION = "0.1"
 
@@ -23,43 +23,6 @@
         version=VERSION, name=os.name, platform=sys.platform,
         twisted=twisted.__version__, python=hex(sys.hexversion)))
 
-
-
-class _CollectBody(protocol.Protocol):
-    def __init__(self, result):
-        self.result = result
-        self.buffer = []
-
-
-    def dataReceived(self, data):
-        self.buffer.append(data)
-
-
-    def connectionLost(self, reason):
-        if reason.check(client.ResponseDone):
-            self.result.callback("".join(self.buffer))
-        else:
-            self.result.errback(reason)
-
-
-
-class Disconnect(protocol.Protocol):
-    def makeConnection(self, transport):
-        transport.stopProducing()
-
-
-
-def readBody(response):
-    if response.code in (http.OK, http.FOUND):
-        result = defer.Deferred()
-        protocol = _CollectBody(result)
-        response.deliverBody(protocol)
-        return result
-    response.deliverBody(Disconnect())
-    raise Exception("Unexpected response code: %d", response.code)
-
-
-
 def main():
     if len(sys.argv) == 3:
         branch, comments = sys.argv[1:]
@@ -73,50 +36,28 @@
     if not branch.startswith('/branches/'):
         branch = '/branches/' + branch
 
-    lock = defer.DeferredLock()
-    requests = []
-    def ebList(err):
-        log.err(err, "Build force failure")
-
-    def forced(result, builder):
-        print 'Forced', builder, '.'
+    def forced(result):
+        print 'Forced.'
 
     args = [
-        ('username', pwd.getpwuid(os.getuid())[0]),
+        ('username', 'twisted'),
+        ('passwd', 'matrix'),
+        ('forcescheduler', 'force-supported'),
         ('revision', ''),
         ('submit', 'Force Build'),
         ('branch', branch),
-        ('comments', comments)]
+        ('reason', '%s: %s' % (pwd.getpwuid(os.getuid())[0], comments))]
 
     agent = client.Agent(reactor, pool=client.HTTPConnectionPool(reactor))
 
     headers = http_headers.Headers({'user-agent': [USER_AGENT]})
-    d = agent.request('GET', SUPPORTED_BUILDERS_URL, headers)
-    d.addCallback(readBody)
-    def gotBuilders(buildersText):
-        builders = buildersText.splitlines()
-
-        if tests is not None:
-            builders.remove('documentation')
-            args.extend([
-                ('property1name', 'test-case-name'),
-                ('property1value', tests)])
-
-        for builder in builders:
-
-            def f(builder, headers):
-                print 'Forcing', builder, '...'
-                url = "http://buildbot.twistedmatrix.com/builders/" + builder + "/force"
-                url = url + '?' + '&'.join([k + '=' + urllib.quote(v) for (k, v) in args])
-                d = agent.request("GET", url, headers)
-                d.addCallback(readBody)
-                d.addCallback(forced, builder)
-                return d
-            requests.append(lock.run(f, builder, headers).addErrback(ebList))
-
-        return defer.gatherResults(requests)
-    d.addCallback(gotBuilders)
-    d.addErrback(log.err)
+
+    print 'Forcing...'
+    url = "http://buildbot.twistedmatrix.com/builders/_all/forceall"
+    url = url + '?' + '&'.join([k + '=' + urllib.quote(v) for (k, v) in args])
+    d = agent.request("GET", url, headers)
+    d.addCallback(forced)
+    d.addErrback(log.err, "Build force failure")
     d.addCallback(lambda ign: reactor.stop())
     reactor.run()
     print 'See http://buildbot.twistedmatrix.com/boxes-supported?branch=%s' % (branch,)