[Piuparts-commits] rev 89 - people/jsw/multi-arch-master
John Wright
jsw-guest at alioth.debian.org
Wed Sep 5 00:53:33 UTC 2007
Author: jsw-guest
Date: 2007-09-05 00:53:33 +0000 (Wed, 05 Sep 2007)
New Revision: 89
Modified:
people/jsw/multi-arch-master/README
people/jsw/multi-arch-master/piuparts-master.conf.sample
people/jsw/multi-arch-master/piuparts-slave.conf.sample
Log:
Update the documentation and sample configuration files
Modified: people/jsw/multi-arch-master/README
===================================================================
--- people/jsw/multi-arch-master/README 2007-09-05 00:27:12 UTC (rev 88)
+++ people/jsw/multi-arch-master/README 2007-09-05 00:53:33 UTC (rev 89)
@@ -42,7 +42,7 @@
suffice:
1. Pick a machine to run the master. It cannot be a chroot,
- but sarge should be good enough.
+ but etch should be good enough.
2. Install piuparts on it.
3. Create an account for the master.
4. Configure /etc/piuparts/piuparts-master.conf
@@ -59,15 +59,15 @@
9. Create an ssh keypair for the slave. No passphrase.
10. Add the slave's public key to the master's
.ssh/authorized_keys
- 11. Configure sudo on the slave machine to allow the slave
- account become root without password (otherwise you'll
- be typing in a password all the time).
+ 11. Configure sudo on the slave machine to allow the slave
+ account run /usr/sbin/piuparts as root without password
+ (otherwise you'll be typing in a password all the time).
12. Run /usr/share/piuparts/piuparts-slave.py on the slave
- accounts. Packages that are installed want to use
- /dev/tty, so you can't do this from cron. Also, you'll
- want to keep an eye on what is happening, to catch
- runaway processes and stuff.
+ accounts. Packages that are installed want to use
+ /dev/tty, so you can't do this from cron. Also, you'll
+ want to keep an eye on what is happening, to catch
+ runaway processes and stuff.
13. The logs go into the master account, into
subdirectories.
@@ -196,10 +196,14 @@
[master]
foo = bar
- where "master" is the name of a section. There can only be
- one section in the master configuration file, but it must
- be named "master". "foo" is the name of a configuration
- item, and "bar" is the value.
+ where "master" is the name of a section. By default,
+ piuparts-master.py uses the "master" section in the master
+ configuration file, but you can tell it to use another
+ section by giving the name of that section as an argument.
+ "foo" is the name of a configuration item, and "bar" is the
+ value. If a section other than "master" is used, all the
+ piuparts logs for that section are kept in a subdirectory by
+ the name of the section.
The following configuration items are defined for the master:
@@ -230,8 +234,9 @@
piuparts-slave uses the configuration file
/etc/piuparts/piuparts-slave.conf. It has the same
general syntax as the master's configuration file. The
- section is called "slave" and the configuration items
- are as follows:
+ default section is called "slave" (again, you can use a
+ different section by specifying it on the command-line) and
+ the configuration items are as follows:
* "idle-sleep" is the length of time the slave should wait
before querying the master again if the master didn't have
@@ -251,7 +256,13 @@
* "master-command" is the command to run on master-host to
start the master. When the master has been installed from
the Debian package, the command is
- "python /usr/share/piuparts/piuparts-master.py".
+ "python /usr/share/piuparts/piuparts-master.py". If you
+ want to use a section in the master configuration file
+ other than "master", append the section name to this
+ command. For example, if the master configuration file has
+ a "sid-ia64" section that you want to use, the command
+ should be
+ "python /usr/share/piuparts/piuparts-master.py sid-ia64".
* "mirror" tells the slave which mirror it is to use. The
slave gives this to piuparts when it runs it.
@@ -272,7 +283,8 @@
* "upgrade-test-distros" is the space delimited list of
distributions the slave should use for testing upgrades
between distributions (i.e., Debian versions). Currently,
- "sarge etch sid" is a good choice.
+ "sarge etch sid" is a good choice. Make this empty if you
+ do not want to run upgrade tests.
* "upgrade-test-chroot-tgz" is the name of the file the slave
should use for the tarball to keep the chroot for the
@@ -292,6 +304,13 @@
more. For a contemporary AMD64 machine with a reasonably
fast disk subsystem the value 50 seems to work fine.
+ * "keep-sources-list" controls whether the slave runs
+ piuparts with the "--keep-sources-list" option. This
+ option does not apply to upgrade tests. The value should
+ be "yes" or "no", with the default being "no". Use this
+ option for dists that you need a custom sources.list for,
+ such as "testing-proposed-updates".
+
* "debug" tells the slave whether to log debug level
messages. The value should be "yes" or "no", with the
default being "no".
Modified: people/jsw/multi-arch-master/piuparts-master.conf.sample
===================================================================
--- people/jsw/multi-arch-master/piuparts-master.conf.sample 2007-09-05 00:27:12 UTC (rev 88)
+++ people/jsw/multi-arch-master/piuparts-master.conf.sample 2007-09-05 00:53:33 UTC (rev 89)
@@ -12,3 +12,15 @@
[master]
log-file = /dev/null
# packages-url = http://your.mirror.here/debian/dists/sid/main/binary-i386/Packages.bz2
+
+# You can have other sections, in order to support one master for multiple
+# dists and/or architectures. In the slave configuration file, be sure to
+# append the appropriate section name to the master-command option.
+
+## [sid-ia64]
+## log-file = /dev/null
+## packages-url = http://ftp.debian.org/debian/dists/sid/binary-ia64/Packages.bz2
+
+## [t-p-u-i386]
+## log-file = /dev/null
+## packages-url = http://ftp.debian.org/debian/dists/testing-proposed-updates/binary-i386/Packages.bz2
Modified: people/jsw/multi-arch-master/piuparts-slave.conf.sample
===================================================================
--- people/jsw/multi-arch-master/piuparts-slave.conf.sample 2007-09-05 00:27:12 UTC (rev 88)
+++ people/jsw/multi-arch-master/piuparts-slave.conf.sample 2007-09-05 00:53:33 UTC (rev 89)
@@ -22,3 +22,25 @@
upgrade-test-chroot-tgz = sarge.tar.gz
max-reserved = 50
debug = no
+
+# As in piuparts-master.conf, you can have multiple sections, so that you can
+# run piuparts-slave.py for multiple dists
+
+# For testing-proposed-updates, you'll have to roll your own chroot, or modify
+# the sources.list in a generated chroot for testing, in order to include the
+# appropriate deb line for testing-proposed-updates
+## [t-p-u-i386]
+## idle-sleep = 300
+## # master-host = localhost
+## # master-user = piuparts
+## # master-directory = .
+## master-command = python /usr/share/piuparts/piuparts-master.py t-p-u-i386
+## # mirror = http://your.mirror.here/debian
+## piuparts-cmd = sudo piuparts
+## distro = testing-proposed-updates
+## chroot-tgz = t-p-u.tar.gz
+## keep-sources-list = yes
+## upgrade-test-distros =
+## upgrade-test-chroot-tgz =
+## max-reserved = 50
+## debug = no
More information about the Piuparts-commits
mailing list