[Piuparts-commits] rev 229 - in piatti: . org/piuparts.debian.org/etc

Sat Mar 14 19:25:55 UTC 2009

Author: holger
Date: 2009-03-14 19:25:55 +0000 (Sat, 14 Mar 2009)
New Revision: 229

Modified:
   piatti/README.txt
   piatti/org/piuparts.debian.org/etc/piuparts-master.conf
   piatti/org/piuparts.debian.org/etc/piuparts-report.conf
   piatti/org/piuparts.debian.org/etc/piuparts-slave.conf
Log:
switch to distro specific configuration

Modified: piatti/README.txt
===================================================================

--- piatti/README.txt	2009-03-14 19:12:27 UTC (rev 228)
+++ piatti/README.txt	2009-03-14 19:25:55 UTC (rev 229)
@@ -19,7 +19,8 @@
 ----
 - in /org/
 	svn co svn://svn.debian.org/svn/piuparts/piatti/org/piuparts.debian.org .
-	mkdir slave master tmp && chmod g+w slave master
+	mkdir slave master tmp cd slave && mkdir sid squeeze lenny2squeeze \
+          && cd ../master && mkdir sid squeeze lenny2squeeze && cd .. && chmod g+w slave master
 - in /home/piupartss:
 	put "export PYTHONPATH=/org/piuparts.debian.org/lib/python2.4/site-packages:/org/piuparts.debian.org/lib/python2.5/site-packages" into .bashrc
 - in /home/piupartsm:
@@ -33,10 +34,17 @@
 
 to start a new run and throw away all results:
 ----------------------------------------------
-piupartss at piatti:/org/piuparts.debian.org$ sudo rm slave/ master/ -Rf && mkdir slave master && chmod g+w slave master && cd slave && nice python ../share/piuparts/piuparts-slave.py
-# should probably become an option for piuparts-slave :)
 
+piupartss at piatti:/org/piuparts.debian.org$ sudo rm slave/ master/ -Rf && mkdir slave master && \
+  mkdir sid squeeze lenny2squeeze && cd ../master && mkdir sid squeeze lenny2squeeze && cd .. && \
+  chmod g+w slave master && cd slave && nice python ../share/piuparts/piuparts-slave.py sid
+# this only tests sid
 
+to create reports:
+------------------
+to be written
+
+
 March 2009
 Luk Claes <luk at debian.org>
 Holger Levsen <holger at debian.org> 

Modified: piatti/org/piuparts.debian.org/etc/piuparts-master.conf
===================================================================
--- piatti/org/piuparts.debian.org/etc/piuparts-master.conf	2009-03-14 19:12:27 UTC (rev 228)
+++ piatti/org/piuparts.debian.org/etc/piuparts-master.conf	2009-03-14 19:25:55 UTC (rev 229)
@@ -2,25 +2,16 @@
 # This is the configuration file for piuparts-master, the master portion
 # of the distributed piuparts system.
 #
-# You MUST make sure that the packages url is set correctly. The sample
-# file does not set it at all, to prevent the master from being run
-# accidentally.
-# 
-# Lars Wirzenius <liw at iki.fi>
-#
 
-[master]
+[sid]
 log-file = master.log
 packages-url = http://ftp.fi.debian.org/debian/dists/sid/main/binary-amd64/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.
+[squeeze]
+log-file = master.log
+packages-url = http://ftp.fi.debian.org/debian/dists/squeeze/main/binary-amd64/Packages.bz2
 
-## [sid-ia64]
-## log-file = /dev/null
-## packages-url = http://ftp.debian.org/debian/dists/sid/binary-ia64/Packages.bz2
+[lenny2squeeze]
+log-file = master.log
+packages-url = http://ftp.fi.debian.org/debian/dists/lenny/main/binary-amd64/Packages.bz2
 
-## [s-p-u-amd64]
-## log-file = /dev/null
-## packages-url = http://ftp.debian.org/debian/dists/stable-proposed-updates/binary-amd64/Packages.bz2

Modified: piatti/org/piuparts.debian.org/etc/piuparts-report.conf
===================================================================
--- piatti/org/piuparts.debian.org/etc/piuparts-report.conf	2009-03-14 19:12:27 UTC (rev 228)
+++ piatti/org/piuparts.debian.org/etc/piuparts-report.conf	2009-03-14 19:25:55 UTC (rev 229)
@@ -2,10 +2,22 @@
 # This is the configuration file for piuparts-report, the HTML report
 # creation portion of the distributed piuparts system.
 #
-# Lars Wirzenius <liw at iki.fi>
-#
 
-[report]
-output-dir = /org/piuparts.debian.org/htdocs/
+[sid]
+output-dir = /org/piuparts.debian.org/htdocs/sid/
+packages-url = http://ftp.fi.debian.org/debian/dists/sid/main/binary-amd64/Packages.bz2
+# not sure if its sensible to keep index-page...
 index-page = index.html
-packages-url = http://ftp.fi.debian.org/debian/dists/sid/main/binary-amd64/Packages.bz2
+
+[squeeze]
+output-dir = /org/piuparts.debian.org/htdocs/squeeze/
+packages-url = http://ftp.fi.debian.org/debian/dists/squeeze/main/binary-amd64/Packages.bz2
+# not sure if its sensible to keep index-page...
+index-page = index.html
+
+[lenny2squeeze]
+output-dir = /org/piuparts.debian.org/htdocs/lenny2squeeze/
+packages-url = http://ftp.fi.debian.org/debian/dists/lenny/main/binary-amd64/Packages.bz2
+# not sure if its sensible to keep index-page...
+index-page = index.html
+

Modified: piatti/org/piuparts.debian.org/etc/piuparts-slave.conf
===================================================================
--- piatti/org/piuparts.debian.org/etc/piuparts-slave.conf	2009-03-14 19:12:27 UTC (rev 228)
+++ piatti/org/piuparts.debian.org/etc/piuparts-slave.conf	2009-03-14 19:25:55 UTC (rev 229)
@@ -2,49 +2,49 @@
 # This is the configuration file for piuparts-slave, the slave portion
 # of the distributed piuparts system.
 #
-# The sample file does not set all required values, to prevent the
-# master from being run accidentally.
-# 
-# Lars Wirzenius <liw at iki.fi>
 #
 
-[slave]
+[sid]
 idle-sleep = 300
 master-host = localhost
 master-user = piupartsm
-master-directory = /org/piuparts.debian.org/master/
-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.py
-#mirror = http://piuparts.cs.helsinki.fi/debian/
+master-directory = /org/piuparts.debian.org/master/sid/
+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.py sid
 mirror = http://ftp.fi.debian.org/debian/
 piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --no-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 = 
-#upgrade-test-distros = etch lenny sid
-#upgrade-test-chroot-tgz = etch.tar.gz
 max-reserved = 50
 debug = yes
 
+[squeeze]
+idle-sleep = 300
+master-host = localhost
+master-user = piupartsm
+master-directory = /org/piuparts.debian.org/master/squeeze/
+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.py squeeze
+mirror = http://ftp.fi.debian.org/debian/
+piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --no-symlinks --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
+distro = squeeze
+chroot-tgz = squeeze.tar.gz
+upgrade-test-distros = 
+upgrade-test-chroot-tgz = 
+max-reserved = 50
 
-# As in piuparts-master.conf, you can have multiple sections, so that you can
-# run piuparts-slave.py for multiple dists
+[lenny2squeeze]
+idle-sleep = 300
+master-host = localhost
+master-user = piupartsm
+master-directory = /org/piuparts.debian.org/master/lenny2squeeze/
+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.py lenny2squeeze
+mirror = http://ftp.fi.debian.org/debian/
+piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --no-symlinks --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
+distro = squeeze
+chroot-tgz = squeeze.tar.gz
+upgrade-test-distros = lenny squeeze
+upgrade-test-chroot-tgz = lenny.tar.gz
+max-reserved = 50
 
-# For stable-proposed-updates, you'll have to roll your own chroot, or modify
-# the sources.list in a generated chroot for stable, in order to include the
-# appropriate deb line for stable-proposed-updates
-## [s-p-u-amd64]
-## idle-sleep = 300
-## # master-host = localhost
-## # master-user = piuparts
-## # master-directory = .
-## master-command = python /usr/share/piuparts/piuparts-master.py s-p-u-amd64
-## # mirror = http://your.mirror.here/debian
-## piuparts-cmd = sudo piuparts
-## distro = stable-proposed-updates
-## chroot-tgz = s-p-u.tar.gz
-## keep-sources-list = yes
-## upgrade-test-distros =
-## upgrade-test-chroot-tgz =
-## max-reserved = 50
-## debug = no
+


