From da7ad5bd2aed2f2ef0a500fe636641a16a7c60e9 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg
Date: Wed, 12 Sep 2012 18:05:19 +0200
Subject: [PATCH] docs/buildbot: add pbuilder pkg, use sudoers.d, add umask
hint
---
_docs/buildbot | 22 ++++++++++++++++------
docs/buildbot.html | 22 ++++++++++++++++------
2 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/_docs/buildbot b/_docs/buildbot
index 77419e0..7f3029a 100644
--- a/_docs/buildbot
+++ b/_docs/buildbot
@@ -1,7 +1,7 @@
The i3 buildbot setup
=====================
Michael Stapelberg
-August 2012
+September 2012
This document explains the http://www.buildbot.net/[buildbot] setup we use to
provide up-to-date documentation and debian packages at http://build.i3wm.org/.
@@ -373,13 +373,13 @@ This is the most complex builder of all. It uses +pbuilder-dist+, +debchange+,
+dpkg-buildpackage+ and +reprepro+ to generate a Debian repository with a
cleanly compiled package for amd64 and i386. In order for it to work, you need
to install the following packages: +apt-get install devscripts dpkg-dev
-reprepro ubuntu-dev-tools+. Afterwards, you need to allow the user as which the
-buildslave runs to execute pbuilder via sudo without needing a password, so run
-+visudo+ and add a line like this one:
+reprepro ubuntu-dev-tools pbuilder+. Afterwards, you need to allow the user as
+which the buildslave runs to execute pbuilder via sudo without needing a
+password, so add a config file like this one:
-*sudoers line*:
+*sudoers.d*:
---------------------------------------------
-build ALL= NOPASSWD: SETENV: /usr/sbin/pbuilder
+echo 'build ALL= NOPASSWD: SETENV: /usr/sbin/pbuilder' > /etc/sudoers.d/build
---------------------------------------------
Then, as the user as which your buildslave runs, setup the pbuilder
@@ -539,6 +539,16 @@ status:
http://code.stapelberg.de/git/go-buildbot-announce/tree/src/i3build.go?id=eeebf1a546454c8a0d82ca623886bb835cd32ba0
+=== Creating the buildslave
+
+One more thing to note is that when creating the buildslave, you should use the
++--umask+ argument to configure the umask for all generated files:
+
+*Creating the buildslave*:
+--------------------------------------------------------------------------------------
+buildslave create-slave --umask=022 i3-buildslave buildbot.i3wm.org build-1
+--------------------------------------------------------------------------------------
+
== Full configuration file
This is the full configuration file, as tested and currently in use (except for
diff --git a/docs/buildbot.html b/docs/buildbot.html
index 786f1a2..57e0202 100644
--- a/docs/buildbot.html
+++ b/docs/buildbot.html
@@ -31,7 +31,7 @@ window.onload = function(){asciidoc.footnotes(); asciidoc.toc(2);}
The i3 buildbot setup
Michael Stapelberg <michael@i3wm.org>
-August 2012
+September 2012
Table of Contents
@@ -436,13 +436,13 @@ f.addStep(DocsToIRC())
dpkg-buildpackage and reprepro to generate a Debian repository with a
cleanly compiled package for amd64 and i386. In order for it to work, you need
to install the following packages: apt-get install devscripts dpkg-dev
-reprepro ubuntu-dev-tools. Afterwards, you need to allow the user as which the
-buildslave runs to execute pbuilder via sudo without needing a password, so run
-visudo and add a line like this one:
-
sudoers line:
+reprepro ubuntu-dev-tools pbuilder. Afterwards, you need to allow the user as
+which the buildslave runs to execute pbuilder via sudo without needing a
+password, so add a config file like this one: