Issue 1281 - Introduce module buildbot

modules/buildbot/templates/master.cfg.erb

 # -*- python -*-
 # ex: set syntax=python:
 <% require 'json' -%>
 
 # This is a sample buildmaster config file. It must be installed as
 # 'master.cfg' in your buildmaster's base directory.
 
 import buildbot.buildslave
 import buildbot.status.html
 import buildbot.status.web.authz
 
 # This is the dictionary that the buildmaster pays attention to.
 # We also use a shorter alias to save typing.
-c = BuildmasterConfig = {}
+c = BuildmasterConfig = <%= @config.to_json %>
 
 ####### BUILDSLAVES
 
 # The 'slaves' list defines the set of recognized buildslaves. Each
 # element is a BuildSlave object, specifying a unique slave name and
 # password. The same slave name and password must be configured on
 # the slave.
 
 c['slaves'] = [
     # Puppet: $slaves where $master == localhost:9989
@@ skipping 79 matching lines @@
         ),
     ),
 )
 
 ####### PROJECT IDENTITY
 
 # the 'title' string will appear at the top of this buildbot
 # installation's html.WebStatus home page (linked to the 'titleURL')
 # and is embedded in the title of the waterfall HTML page.
 
-c['title'] = <%= @project.fetch('title', 'Example').to_s.to_json %>
-c['titleURL'] = <%= @project.fetch('url', 'http://example.com/').to_s.to_json %>
+c.setdefault('title', 'Example')
+c.setdefault('titleURL', 'http://example.com/')

[Felix Dahlke, 2016/02/10 09:26:10]

I suppose I'm missing something, but where are setting title and titleURL to
their real values?

[mathias, 2016/02/10 10:30:45]

Above, line 14; c = BuildmasterConfig = <%= @config.to_json %>

[Felix Dahlke, 2016/02/10 11:54:40]

Acknowledged.

 
 # the 'buildbotURL' string points to the location where the buildbot's
 # internal web server (usually the html.WebStatus page) is visible. This
 # typically uses the port number set in the Waterfall 'status' entry,
 # but with an externally-visible host name which the buildbot cannot
 # figure out without some help.
 
-c['buildbotURL'] = 'http://localhost:<%= @http_port.to_i %>/'

[Felix Dahlke, 2015/11/19 19:50:02]

Shouldn't the host/domain/URL come from the manifest, rather than sticking with
localhost here?

[mathias, 2016/01/20 16:13:53]

Indeed, the documentation (taken from the original sample.cfg) is a bit
confusing: "internal web server" but "externally-visible", for example.

I dug through the Python code to find some clarity. There is no actual use of
the value, except for passing it on when generating status mails (though not
explicitly used there either). Together with the fact that it's in the PROJECT
IDENTITY section, I suppose my former interpretation ("internal web server") is
wrong and this should be the base URI for external links ("externally-visible
host name"). Note that this means the buildbotURL value can become another
meta-parameter.

[Felix Dahlke, 2016/02/10 09:26:10]

Yeah, it's the externally visible URL. We're still not setting it properly how I
see it.

[mathias, 2016/02/10 10:30:45]

Indeed, this should be a setdefault() as well (the URL is set in
adblockplus::buildmaster).

[Felix Dahlke, 2016/02/10 11:54:39]

Waiting for another patch set with this then.

[mathias, 2016/02/18 10:54:42]

Actually this was correct in the last patch-set already, though the Rietveld GUI
doesn't really make that obvious and I missed it myself.. However, see
https://codereview.adblockplus.org/29325436/diff2/29329287:29334156/modules/b...

+c.setdefault('buildbotURL', 'http://localhost:<%= @http_port.to_i %>/')
 
 ####### DB URL
 
 # This specifies what database buildbot uses to store change and
 # scheduler state. Leave this at its default for all but maybe the
 # largest installations.
 
 c['db_url'] = <%= @database.to_s.to_json %>