[Piuparts-commits] rev 573 - piatti/org/piuparts.debian.org/etc

[Holger Levsen]

Author: holger
Date: 2009-12-18 12:23:35 +0000 (Fri, 18 Dec 2009)
New Revision: 573

Modified:
   piatti/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
   piatti/org/piuparts.debian.org/etc/piuparts.conf.piatti
Log:
better describe tests done and 'merge' files

Modified: piatti/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
===================================================================
--- piatti/org/piuparts.debian.org/etc/piuparts.conf.goldwasser	2009-12-17 14:29:08 UTC (rev 572)
+++ piatti/org/piuparts.debian.org/etc/piuparts.conf.goldwasser	2009-12-18 12:23:35 UTC (rev 573)
@@ -1,5 +1,7 @@
 #
-# This is the configuration file for piuparts running in master-slave mode.
+# This is the configuration file for piuparts running in master-slave mode on a host called goldwasser
+# 
+# For more information on this setup see http://svn.debian.org/viewsvn/piuparts/piatti/README.txt
 #
 #
 
@@ -10,24 +12,26 @@
 master-user = piupartsm
 master-directory = /org/piuparts.debian.org/master/
 output-directory = /org/piuparts.debian.org/htdocs/
-idle-sleep = 300
+idle-sleep = 1800
 
 [sid]
-description = Debian sid / main, installation and removal tests
+description = Debian sid / main: package installation, removal and purge test.
 master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.4/site-packages:/org/piuparts.debian.org/lib/python2.5/site-packages python /org/piuparts.debian.org/share/piuparts/piuparts-master sid
 packages-url = http://ftp.de.debian.org/debian/dists/sid/main/binary-amd64/Packages.bz2
 sources-url = http://ftp.de.debian.org/debian/dists/sid/main/source/Sources.bz2
 mirror = http://ftp.de.debian.org/debian/
-piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --skip-minimize --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
+piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
 distro = sid
 chroot-tgz = sid.tar.gz
 upgrade-test-distros = 
 upgrade-test-chroot-tgz = 
-max-reserved = 30
+max-reserved = 25
 log-file = sid-master.log
+# Once there are no packages left which leave files on purge behind, 
+# --pedantic-purge-test should be added
 
 [squeeze]
-description = Debian squeeze / main, installation and removal tests as well as installation in lenny and upgrade to squeze and then removal tests
+description = Debian squeeze / main: package installation, removal and purge test as well as package installation in lenny and upgrade to squeze, then removal and purge test.
 master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.4/site-packages:/org/piuparts.debian.org/lib/python2.5/site-packages python /org/piuparts.debian.org/share/piuparts/piuparts-master squeeze
 packages-url = http://ftp.de.debian.org/debian/dists/squeeze/main/binary-amd64/Packages.bz2
 sources-url = http://ftp.de.debian.org/debian/dists/squeeze/main/source/Sources.bz2

Modified: piatti/org/piuparts.debian.org/etc/piuparts.conf.piatti
===================================================================
--- piatti/org/piuparts.debian.org/etc/piuparts.conf.piatti	2009-12-17 14:29:08 UTC (rev 572)
+++ piatti/org/piuparts.debian.org/etc/piuparts.conf.piatti	2009-12-18 12:23:35 UTC (rev 573)
@@ -14,12 +14,12 @@
 idle-sleep = 1800
 
 [sid]
-description = Debian sid / main, installation and removal tests
+description = Debian sid / main: package installation, removal and purge test.
 master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.4/site-packages:/org/piuparts.debian.org/lib/python2.5/site-packages python /org/piuparts.debian.org/share/piuparts/piuparts-master sid
 packages-url = http://piatti.debian.org/debian/dists/sid/main/binary-amd64/Packages.bz2
 sources-url = http://piatti.debian.org/debian/dists/sid/main/source/Sources.bz2
 mirror = http://piatti.debian.org/debian/
-piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --skip-minimize --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
+piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
 distro = sid
 chroot-tgz = sid.tar.gz
 upgrade-test-distros = 
@@ -30,12 +30,12 @@
 # --pedantic-purge-test should be added
 
 [squeeze]
-description = Debian squeeze / main, installation and removal tests as well as installation in lenny and upgrade to squeze and then removal tests
+description = Debian squeeze / main: package installation, removal and purge test as well as package installation in lenny and upgrade to squeze, then removal and purge test.
 master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.4/site-packages:/org/piuparts.debian.org/lib/python2.5/site-packages python /org/piuparts.debian.org/share/piuparts/piuparts-master squeeze
 packages-url = http://piatti.debian.org/debian/dists/squeeze/main/binary-amd64/Packages.bz2
 sources-url = http://piatti.debian.org/debian/dists/squeeze/main/source/Sources.bz2
 mirror = http://piatti.debian.org/debian/
-piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --skip-minimize --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
+piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
 distro = squeeze
 chroot-tgz = squeeze.tar.gz
 upgrade-test-distros = lenny squeeze