move contents from buildbot to sbuildbot

There is a jhbuildbot/buildbot already in the path.  By renaming to sbuildbot we can do selective module overrides

43 files changed, 542 insertions, 0 deletions

diff --git a/sbuildbot/.svnignore b/sbuildbot/.svnignore
new file mode 100644
index 0000000..2769657
--- /dev/null
+++ b/sbuildbot/.svnignore
@@ -0,0 +1,5 @@
+builddir
+changes.pck
+twistd.log*
+twistd.pid
+slaves.csv
diff --git a/sbuildbot/AUTHORS b/sbuildbot/AUTHORS
new file mode 100644
index 0000000..01194e8
--- /dev/null
+++ b/sbuildbot/AUTHORS
@@ -0,0 +1,5 @@
+John Carr <john.carr@unrouted.co.uk>
+Frederic Peters <fpeters@0d.be>
+Alejandro Piñeiro <apinheiro@igalia.com>
+Iago Toral <itoral@igalia.com>
+Jose Dapena <jdapena@igalia.com>
diff --git a/sbuildbot/Makefile b/sbuildbot/Makefile
new file mode 100644
index 0000000..5f79e59
--- /dev/null
+++ b/sbuildbot/Makefile
@@ -0,0 +1,19 @@
+# -*- makefile -*-
+
+# This is a simple makefile which lives in a buildmaster/buildslave
+# directory (next to the buildbot.tac file). It allows you to start/stop the
+# master or slave by doing 'make start' or 'make stop'.
+
+# The 'reconfig' target will tell a buildmaster to reload its config file.
+
+start:
+	twistd --no_save -y buildbot.tac --nodaemon
+
+stop:
+	kill `cat twistd.pid`
+
+reconfig:
+	kill -HUP `cat twistd.pid`
+
+log:
+	tail -f twistd.log
diff --git a/sbuildbot/README b/sbuildbot/README
new file mode 100644
index 0000000..cafbebb
--- /dev/null
+++ b/sbuildbot/README
@@ -0,0 +1,5 @@
+You must at minimum edit those two lines in master.cfg:
+ c['jhbuild'] = "~/bin/jhbuild"
+ c['jhbuildrc'] = "/home/fred/.jhbuildrc"
+
+You must also define slaves in the slaves.csv file.
diff --git a/sbuildbot/buildbot.tac b/sbuildbot/buildbot.tac
new file mode 100644
index 0000000..e97e732
--- /dev/null
+++ b/sbuildbot/buildbot.tac
@@ -0,0 +1,12 @@
+from twisted.application import service
+from buildbot.master import BuildMaster
+import os
+
+basedir = os.path.dirname(os.path.abspath(__file__))
+if not os.path.exists(os.path.join(basedir, 'builddir')):
+    os.makedirs(os.path.join(basedir, 'builddir'))
+configfile = r'master.cfg'
+
+application = service.Application('buildmaster')
+BuildMaster(basedir, configfile).setServiceParent(application)
+
diff --git a/sbuildbot/master.cfg b/sbuildbot/master.cfg
new file mode 100644
index 0000000..067034e
--- /dev/null
+++ b/sbuildbot/master.cfg
@@ -0,0 +1,80 @@
+# -*- python -*-
+# ex: set syntax=python:
+
+# This is a sample buildmaster config file. It must be installed as
+# 'master.cfg' in your buildmaster's base directory (although the filename
+# can be changed with the --basedir option to 'mktap buildbot master').
+
+# It has one job: define a dictionary named BuildmasterConfig. This
+# dictionary has a variety of keys to control different aspects of the
+# buildmaster. They are documented in docs/config.xhtml .
+
+import buildbot
+
+# This is the dictionary that the buildmaster pays attention to. We also use
+# a shorter alias to save typing.
+c = BuildmasterConfig = {}
+
+# 'slavePortnum' defines the TCP port to listen on. This must match the value
+# configured into the buildslaves (with their --master option)
+
+c['slavePortnum'] = 9070
+
+####### STATUS TARGETS
+
+# 'status' is a list of Status Targets. The results of each build will be
+# pushed to these targets. buildbot/status/*.py has a variety to choose from,
+# including web pages, email senders, and IRC bots.
+
+c['status'] = []
+
+from buildbot.status import mail
+c['status'].append(mail.MailNotifier(fromaddr="buildbot@sugarlabs.org",
+                                      extraRecipients=["dfarning@sugarlabs.org"],
+                                      sendToInterestedUsers=False))
+#
+from buildbot.status import words
+c['status'].append(words.IRC(host="irc.freenode.net", nick="buildbot",
+                              channels=["#sugar"], port=8001))
+#
+# from buildbot.status import client
+# c['status'].append(client.PBListener(9988))
+
+
+####### DEBUGGING OPTIONS
+
+# if you set 'debugPassword', then you can connect to the buildmaster with
+# the diagnostic tool in contrib/debugclient.py . From this tool, you can
+# manually force builds and inject changes, which may be useful for testing
+# your buildmaster without actually commiting changes to your repository (or
+# before you have a functioning 'sources' set up). The debug tool uses the
+# same port number as the slaves do: 'slavePortnum'.
+
+#c['debugPassword'] = "debugpassword"
+
+# if you set 'manhole', you can ssh into the buildmaster and get an
+# interactive python shell, which may be useful for debugging buildbot
+# internals. It is probably only useful for buildbot developers. You can also
+# use an authorized_keys file, or plain telnet.
+#from buildbot import manhole
+#c['manhole'] = manhole.PasswordManhole("tcp:9999:interface=127.0.0.1",
+#                                       "admin", "password")
+
+
+####### PROJECT IDENTITY
+
+# the 'projectName' string will be used to describe the project that this
+# buildbot is working on. For example, it is used as the title of the
+# waterfall HTML page. The 'projectURL' string will be used to provide a link
+# from buildbot HTML pages to your project's home page.
+
+c['projectName'] = "Sugar Labs Buildbot"
+c['projectURL'] = "http://www.sugarlabs.org"
+
+# the 'buildbotURL' string should point to the location where the buildbot's
+# internal web server (usually the html.Waterfall 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:8080/"
diff --git a/sbuildbot/public_html/bar.png b/sbuildbot/public_html/bar.png
new file mode 100644
index 0000000..e5b354e
--- /dev/null
+++ b/sbuildbot/public_html/bar.png
diff --git a/sbuildbot/public_html/building.png b/sbuildbot/public_html/building.png
new file mode 100644
index 0000000..46ad8a0
--- /dev/null
+++ b/sbuildbot/public_html/building.png
diff --git a/sbuildbot/public_html/cyan-bar.png b/sbuildbot/public_html/cyan-bar.png
new file mode 100644
index 0000000..6c44fdf
--- /dev/null
+++ b/sbuildbot/public_html/cyan-bar.png
diff --git a/sbuildbot/public_html/download.png b/sbuildbot/public_html/download.png
new file mode 100644
index 0000000..cf1945c
--- /dev/null
+++ b/sbuildbot/public_html/download.png
diff --git a/sbuildbot/public_html/emptyimg.png b/sbuildbot/public_html/emptyimg.png
new file mode 100644
index 0000000..9b63c56
--- /dev/null
+++ b/sbuildbot/public_html/emptyimg.png
diff --git a/sbuildbot/public_html/error.png b/sbuildbot/public_html/error.png
new file mode 100644
index 0000000..4c485f7
--- /dev/null
+++ b/sbuildbot/public_html/error.png
diff --git a/sbuildbot/public_html/feed-atom.png b/sbuildbot/public_html/feed-atom.png
new file mode 100644
index 0000000..c8d70ca
--- /dev/null
+++ b/sbuildbot/public_html/feed-atom.png
diff --git a/sbuildbot/public_html/feed.png b/sbuildbot/public_html/feed.png
new file mode 100644
index 0000000..eb47e19
--- /dev/null
+++ b/sbuildbot/public_html/feed.png
diff --git a/sbuildbot/public_html/figure.png b/sbuildbot/public_html/figure.png
new file mode 100644
index 0000000..18aac33
--- /dev/null
+++ b/sbuildbot/public_html/figure.png
diff --git a/sbuildbot/public_html/foot-16.png b/sbuildbot/public_html/foot-16.png
new file mode 100644
index 0000000..95c4ff6
--- /dev/null
+++ b/sbuildbot/public_html/foot-16.png
diff --git a/sbuildbot/public_html/foot.png b/sbuildbot/public_html/foot.png
new file mode 100644
index 0000000..1138da1
--- /dev/null
+++ b/sbuildbot/public_html/foot.png
diff --git a/sbuildbot/public_html/general_bg.png b/sbuildbot/public_html/general_bg.png
new file mode 100644
index 0000000..8840fe2
--- /dev/null
+++ b/sbuildbot/public_html/general_bg.png
diff --git a/sbuildbot/public_html/general_separator.png b/sbuildbot/public_html/general_separator.png
new file mode 100644
index 0000000..bd865e8
--- /dev/null
+++ b/sbuildbot/public_html/general_separator.png
diff --git a/sbuildbot/public_html/gnome-16.png b/sbuildbot/public_html/gnome-16.png
new file mode 100644
index 0000000..95c4ff6
--- /dev/null
+++ b/sbuildbot/public_html/gnome-16.png
diff --git a/sbuildbot/public_html/gnome-64.png b/sbuildbot/public_html/gnome-64.png
new file mode 100644
index 0000000..09a3184
--- /dev/null
+++ b/sbuildbot/public_html/gnome-64.png
diff --git a/sbuildbot/public_html/gnome-gtp.png b/sbuildbot/public_html/gnome-gtp.png
new file mode 100644
index 0000000..c7ed133
--- /dev/null
+++ b/sbuildbot/public_html/gnome-gtp.png
diff --git a/sbuildbot/public_html/green-bar.png b/sbuildbot/public_html/green-bar.png
new file mode 100644
index 0000000..d02dd14
--- /dev/null
+++ b/sbuildbot/public_html/green-bar.png
diff --git a/sbuildbot/public_html/idle.png b/sbuildbot/public_html/idle.png
new file mode 100644
index 0000000..4f031b7
--- /dev/null
+++ b/sbuildbot/public_html/idle.png
diff --git a/sbuildbot/public_html/images.jpeg b/sbuildbot/public_html/images.jpeg
new file mode 100644
index 0000000..54730ee
--- /dev/null
+++ b/sbuildbot/public_html/images.jpeg
diff --git a/sbuildbot/public_html/info.png b/sbuildbot/public_html/info.png
new file mode 100644
index 0000000..bbd5dba
--- /dev/null
+++ b/sbuildbot/public_html/info.png
diff --git a/sbuildbot/public_html/lgo.css b/sbuildbot/public_html/lgo.css
new file mode 100644
index 0000000..861cc83
--- /dev/null
+++ b/sbuildbot/public_html/lgo.css
@@ -0,0 +1,365 @@
+body {
+	margin: 0px;
+	padding: 0px;
+	font-family: sans-serif;
+	background: white;
+	color: black;
+	height: 101%;
+}
+
+body.with-star {
+	background: white url(star.png) -100px -200px no-repeat;
+}
+
+#page {
+	margin: 0px;
+	padding: 0px;
+}
+
+div.in-column {
+	margin: 0 0 2em 1em;
+	float: right;
+	max-width: 12em;
+}
+
+hr {
+	color: #888;
+	background: #888;
+	border: 0;
+	height: 1px;
+	width: 90%;
+	text-align: center;
+	clear: both;
+}
+
+
+div.body {
+	clear: both;
+}
+
+
+div.sidebar {
+	position: absolute;
+	text-align: left;
+	right: 0px;
+	top: 60px;
+	width: 27ex;
+	padding-left: 1ex;
+	border-left: 1ex solid #eee;
+	margin-top: 4em;
+}
+
+div.sidebar h2 {
+	margin-top: 0;
+	padding: 5px 2ex 5px 2ex;
+	background: url(t.png) top left repeat-y;
+	font-size: 100%;
+}
+
+#general {
+	list-style: none;
+	background: #2E3436 url(general_bg.png) 0 100% repeat-x;
+	text-align: right;
+	padding: 0 1ex;
+	margin: 0;
+	font-size: 70%;
+}
+
+#general li {
+	display: inline;
+	background: url(general_separator.png) 0 0 no-repeat;
+	padding-top: 10px;
+	padding-bottom: 8px;
+	margin-left: 0px;
+	margin-top: 0px;
+}
+
+#general li a {
+	font-weight: bold;
+	color: #FFFFFF;
+	margin: 0 2ex;
+	text-decoration: none;
+	line-height: 30px;
+}
+
+#general li a:hover {
+	text-decoration: underline;
+}
+
+#general .home {
+	float: left;
+	background: url(general_separator.png) 100% 0 no-repeat;
+	padding-top: 0;
+	padding-bottom: 0;
+}
+
+#general .home a {
+	float: left;
+	background: url(foot.png) 7px 50% no-repeat;
+	margin-left: 0;
+	padding-left: 27px;
+}
+
+
+#header {
+	background: #729FCF url(robot.png) 15px 12px no-repeat;
+	float: left;
+	width: 100%;
+	font-size: 75%;
+}
+
+#header h1 {
+	margin: 0;
+	margin-left: 85px;
+	padding-top: 25px;
+	font-size: 200%;
+	color: #eeeeec;
+}
+
+#header h1 a {
+	text-decoration: inherit;
+	color: inherit;
+}
+
+#tabs {
+	background: url(bar.png) 0 100% repeat-x;
+	width: 100%;
+	float: left;
+	margin: 0;
+	padding: 0;
+}
+
+#portal-globalnav {
+	float: right;
+	list-style: none;
+	margin: 0;
+	margin-right: 3ex;
+}
+
+#portal-globalnav li {
+	float: left;
+	margin: 0;
+	margin-left: 0.2ex;
+	font-size: 2ex;
+}
+
+#portal-globalnav li a:hover {
+	color: #111111;
+}
+
+#portal-globalnav li a {
+	float: left;
+	text-decoration: none;
+	color: #555555;
+	background: url(tab_left.png) 0 0 no-repeat;
+	padding: 7px 0 7px 7px;
+	border-bottom: 2px solid #CCCCCC;
+}
+
+#portal-globalnav li span {
+	background: url(tab_right.png) 100% 0 no-repeat;
+	padding: 7px 28px 7px 19px;
+}
+
+#portal-globalnav li.selected a {
+	color: #3566A5;
+	background: url(tab_left.png) 0 -57px no-repeat;
+	border-bottom: none;
+	padding-top: 8px;
+	padding-bottom: 8px;
+}
+
+#portal-globalnav li.selected a span {
+	background: url(tab_right.png) 100% -57px no-repeat;
+	padding-top: 8px;
+	padding-bottom: 8px;
+}
+
+div.body {
+	background-color: transparent;
+	border: none;
+	padding: 1em;
+} 
+
+div.body-sidebar {
+	margin-right: 27ex;
+}
+
+a {
+	color: #3465a4;
+}
+
+div.navbar {
+	margin: 0 29ex 0 2ex;
+}
+
+a img {
+	border: none;
+}
+
+div#footer {
+	border-top: 1px solid gray;
+	color: #888;
+	font-size: 80%;
+	margin: 3em 3em 1em;
+	padding-top: 1.5em;
+	text-align: center;
+}
+
+/* Buildbot stuff */
+
+table.ProjectSummary tbody th {
+	text-align: left;
+}
+
+table.ProjectSummary thead td {
+	text-align: center;
+}
+
+table.ProjectSummary tbody td {
+	border: 1px solid #888;
+	padding: 0 3px;
+	text-align: center;
+}
+
+table.ProjectSummary tbody td.feed {
+	border: none;
+	padding-right: 2px;
+}
+
+th.offline, th.idle, th.building {
+	background: white url(offline.png) center right no-repeat;
+	padding: 0 16px;
+	cursor: help;
+}
+
+th.idle {
+	background-image: url(idle.png);
+}
+
+th.building {
+	background-image: url(building.png);
+}
+
+th.offline {
+	color: #888;
+}
+
+.success {
+	background: #8f8;
+}
+
+.failure {
+	background: #f88;
+}
+td.running,
+td.building {
+	background: #ff8;
+}
+td.idle {
+	color: #888;
+	background: #f8f8f8;
+}
+td.offline {
+	color: #000;
+	background: #f88;
+}
+td.failedchecks {
+	background: #fa4;
+}
+
+
+table.waterfall {
+}
+
+table.waterfall td.Time {
+	background: #e0e0e0;
+	border: 1px solid #888;
+	text-align: center;
+	padding: 0 2px;
+}
+
+table.waterfall td.LastBuild,
+table.waterfall td.BuildStep {
+	border: 1px solid #888;
+}
+
+table.waterfall .Change {
+	padding-right: 1em;
+}
+
+table.waterfall td.start {
+	background: #ff8;
+	font-weight: bold;
+}
+
+table.waterfall td.start a {
+	text-decoration: none;
+}
+
+table.waterfall td.exception {
+	border: 3px solid red;
+	background: #c66;
+}
+
+/* From classic */
+/*
+td.Change, td.Time, td.Event {
+    background: #e0e0e0;
+}
+
+td.Event, td.BuildStep, td.Activity, td.Change, td.Time, td.Builder, td.LastBuild {
+    border-top: 1px solid;
+    border-right: 1px solid;
+    border-bottom: 1px solid;
+    border-left: 1px solid;
+}
+*/
+
+tr.totals td {
+    padding-top: 1ex;
+    text-align: center;
+    font-weight: bold;
+}
+
+div.changeset ul {
+	margin-left: 0em;
+	padding-left: 0em;
+	list-style: none;
+}
+
+div.changeset ul ul {
+	padding-left: 1em;
+}
+
+ul#tests-summary {
+	margin: 1em;
+	padding: 0;
+	list-style: none;
+	-webkit-column-width: 15em;
+	-moz-column-width: 15em;
+	column-width: 15em;
+	-webkit-column-gap: 1em;
+	-moz-column-gap: 1em;
+	column-gap: 1em;
+}
+
+ul#tests-summary li {
+	margin-bottom: 1ex;
+}
+
+li.changeset {
+	border: 1px dashed #555;
+	background: #eee;
+	padding: 1ex;
+	font-size: 80%;
+	margin-bottom: 1em;
+}
+
+li.changeset p {
+	margin: 0;
+}
+
+li.changeset pre {
+	margin: 0;
+}
diff --git a/sbuildbot/public_html/logo.png b/sbuildbot/public_html/logo.png
new file mode 100644
index 0000000..06e0940
--- /dev/null
+++ b/sbuildbot/public_html/logo.png
diff --git a/sbuildbot/public_html/media b/sbuildbot/public_html/media
new file mode 120000
index 0000000..b8424c4
--- /dev/null
+++ b/sbuildbot/public_html/media
@@ -0,0 +1 @@
+/var/www/sugarlabs/media/
\ No newline at end of file
diff --git a/sbuildbot/public_html/nobody.png b/sbuildbot/public_html/nobody.png
new file mode 100644
index 0000000..dee7669
--- /dev/null
+++ b/sbuildbot/public_html/nobody.png
diff --git a/sbuildbot/public_html/offline.png b/sbuildbot/public_html/offline.png
new file mode 100644
index 0000000..bc9a1b7
--- /dev/null
+++ b/sbuildbot/public_html/offline.png
diff --git a/sbuildbot/public_html/purple-bar.png b/sbuildbot/public_html/purple-bar.png
new file mode 100644
index 0000000..0c35c53
--- /dev/null
+++ b/sbuildbot/public_html/purple-bar.png
diff --git a/sbuildbot/public_html/red-bar.png b/sbuildbot/public_html/red-bar.png
new file mode 100644
index 0000000..3439fd5
--- /dev/null
+++ b/sbuildbot/public_html/red-bar.png
diff --git a/sbuildbot/public_html/robot.png b/sbuildbot/public_html/robot.png
new file mode 100644
index 0000000..65a5304
--- /dev/null
+++ b/sbuildbot/public_html/robot.png
diff --git a/sbuildbot/public_html/robots.txt b/sbuildbot/public_html/robots.txt
new file mode 100644
index 0000000..1f53798
--- /dev/null
+++ b/sbuildbot/public_html/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /
diff --git a/sbuildbot/public_html/star.png b/sbuildbot/public_html/star.png
new file mode 100644
index 0000000..a152a93
--- /dev/null
+++ b/sbuildbot/public_html/star.png
diff --git a/sbuildbot/public_html/t.png b/sbuildbot/public_html/t.png
new file mode 100644
index 0000000..7b67341
--- /dev/null
+++ b/sbuildbot/public_html/t.png
diff --git a/sbuildbot/public_html/tab_left.png b/sbuildbot/public_html/tab_left.png
new file mode 100644
index 0000000..0ead7a1
--- /dev/null
+++ b/sbuildbot/public_html/tab_left.png
diff --git a/sbuildbot/public_html/tab_right.png b/sbuildbot/public_html/tab_right.png
new file mode 100644
index 0000000..2ee74d6
--- /dev/null
+++ b/sbuildbot/public_html/tab_right.png
diff --git a/sbuildbot/public_html/warn.png b/sbuildbot/public_html/warn.png
new file mode 100644
index 0000000..9a8c5bb
--- /dev/null
+++ b/sbuildbot/public_html/warn.png
diff --git a/sbuildbot/public_html/webpage.png b/sbuildbot/public_html/webpage.png
new file mode 100644
index 0000000..e5d80c1
--- /dev/null
+++ b/sbuildbot/public_html/webpage.png
diff --git a/sbuildbot/slaves.csv b/sbuildbot/slaves.csv
new file mode 100644
index 0000000..76d9939
--- /dev/null
+++ b/sbuildbot/slaves.csv
@@ -0,0 +1,2 @@
+Fedora10,nice
+Fedora-Rawhide,nice
diff --git a/sbuildbot/template.html b/sbuildbot/template.html
new file mode 100644
index 0000000..281c85d
--- /dev/null
+++ b/sbuildbot/template.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en"><head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>@@GNOME_BUILDBOT_TITLE@@</title>
+  <link rel="stylesheet" type="text/css" href="/lgo.css">
+  <link rel="icon" type="image/x-icon" href="/media/images/favicon.ico">
+  <link rel="SHORTCUT ICON" type="image/x-icon" href="/media/images/favicon.ico">
+</head>
+<body class="with-star">
+<div id="page">
+<ul id="general">
+<li id="siteaction-sugarlabs_home" class="home"><a href="http://wiki.sugarlabs.org/">Home</a></li>
+<li id="siteaction-sugarlabs_trac"><a href="http://dev.sugarlabs.org/">Trac</a></li>
+<li id="siteaction-sugarlabs_plant"><a href="http://planet.sugarlabs.org/">Planet</a></li>
+<li id="siteaction-sugarlabs_list"><a href="http://lists.sugarlabs.org/">Lists</a></li>
+<li id="siteaction-sugarlabs_schools"><a href="http://schools.sugarlabs.org/">Schools</a></li>
+<li id="siteaction-sugarlabs_download"><a href="http://download.sugarlabs.org/">Download</a></li>
+<li id="siteaction-sugarlabs_api"><a href="http://api.sugarlabs.org/">API</a></li>
+<li id="siteaction-sugarlabs_git"><a href="http://git.sugarlabs.org/">Gitorious</a></li>
+</ul>
+<div id="header">
+<h1><a href="/">@@GNOME_BUILDBOT_TITLE@@</a></h1>
+
+ <div id="tabs">
+  <ul id="portal-globalnav">
+    <li id="portaltab-0" class="selected"><a href="http://buildbot.sugarlabs.org"><span>Sugar</span></a></li>
+    <li id="portaltab-1"><a href="http://sugarlabs.org/go/DevelopmentTeam"><span>Developers</span></a></li>
+  </ul>
+ </div>
+</div>
+</div>
+<div class="body">
+
+@@GNOME_BUILDBOT_BODY@@
+
+
+  <div id="footer">
+    Copyright &copy; 2008 <a href="http://www.sugarlabs.org/">The Sugar Learning Project</a>.<br />
+    <br/>
+    Powered by <a href="http://buildbot.net">Buildbot</a>.
+  </div>
+
+
+</div> <!-- end of .body -->
+</body>
+</html>