[Piuparts-commits] rev 292 - piatti piatti/home/piupartsm piatti/org/piuparts.debian.org/etc trunk/debian

[Holger Levsen]

Author: holger
Date: 2009-03-20 00:27:30 +0000 (Fri, 20 Mar 2009)
New Revision: 292

Added:
   piatti/org/piuparts.debian.org/etc/piuparts.conf
Removed:
   piatti/org/piuparts.debian.org/etc/piuparts-slave.conf
Modified:
   piatti/README.txt
   piatti/home/piupartsm/crontab
   trunk/debian/changelog
Log:
 * Install scripts for master-slave mode without .py extension.


Modified: piatti/README.txt
===================================================================
--- piatti/README.txt	2009-03-20 00:19:42 UTC (rev 291)
+++ piatti/README.txt	2009-03-20 00:27:30 UTC (rev 292)
@@ -57,13 +57,13 @@
 
 Generating reports for the website
 ----------------------------------
-piuparts-report.py is run from ~/piupartsm/crontab
+piuparts-report is run from ~/piupartsm/crontab
 
 to start a new run and throw away all results:
 ----------------------------------------------
 ----
 piupartss at piatti:/org/piuparts.debian.org$ ./update-piuparts-setup
-piupartss at piatti:/org/piuparts.debian.org/slave$ nice python ../../share/piuparts/piuparts-slave.py 
+piupartss at piatti:/org/piuparts.debian.org/slave$ nice python ../../share/piuparts/piuparts-slave 
 ----
 
 filing bugs

Modified: piatti/home/piupartsm/crontab
===================================================================
--- piatti/home/piupartsm/crontab	2009-03-20 00:19:42 UTC (rev 291)
+++ piatti/home/piupartsm/crontab	2009-03-20 00:27:30 UTC (rev 292)
@@ -8,5 +8,5 @@
 # create reports once a day
 #  (dinstall runs 1|7|13|19:52, so this is long after mirror pushes...)
 #
-42 6 * * * PYTHONPATH=/org/piuparts.debian.org/lib/python2.4/site-packages:/org/piuparts.debian.org/lib/python2.5/site-packages nice python /org/piuparts.debian.org/share/piuparts/piuparts-report.py 
+42 6 * * * PYTHONPATH=/org/piuparts.debian.org/lib/python2.4/site-packages:/org/piuparts.debian.org/lib/python2.5/site-packages nice python /org/piuparts.debian.org/share/piuparts/piuparts-report
 

Deleted: piatti/org/piuparts.debian.org/etc/piuparts-slave.conf

Copied: piatti/org/piuparts.debian.org/etc/piuparts.conf (from rev 291, piatti/org/piuparts.debian.org/etc/piuparts-slave.conf)
===================================================================
--- piatti/org/piuparts.debian.org/etc/piuparts.conf	                        (rev 0)
+++ piatti/org/piuparts.debian.org/etc/piuparts.conf	2009-03-20 00:27:30 UTC (rev 292)
@@ -0,0 +1,47 @@
+#
+# This is the configuration file for piuparts running in master-slave mode.
+#
+#
+
+[global]
+sections = sid squeeze
+master-host = localhost
+master-user = piupartsm
+master-command = echo hello
+index-page = /org/piuparts.debian.org/htdocs/index.html
+
+[sid]
+idle-sleep = 300
+master-host = localhost
+master-user = piupartsm
+master-directory = /org/piuparts.debian.org/master/
+output-directory = /org/piuparts.debian.org/htdocs/
+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
+log-file = master.log
+packages-url = http://ftp.fi.debian.org/debian/dists/sid/main/binary-amd64/Packages.bz2
+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 = 
+max-reserved = 100
+
+[squeeze]
+idle-sleep = 300
+master-host = localhost
+master-user = piupartsm
+output-directory = /org/piuparts.debian.org/htdocs/
+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 squeeze
+log-file = master.log
+packages-url = http://ftp.fi.debian.org/debian/dists/squeeze/main/binary-amd64/Packages.bz2
+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
+
+


Property changes on: piatti/org/piuparts.debian.org/etc/piuparts.conf
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-03-20 00:19:42 UTC (rev 291)
+++ trunk/debian/changelog	2009-03-20 00:27:30 UTC (rev 292)
@@ -23,6 +23,7 @@
       failure analysing will be harder.
   * Break backwards compatibility of the configuration files for master-slave-
     mode. Merge those three into one: /etc/piuparts/piuparts/piuparts.conf
+  * Install scripts for master-slave mode without .py extension.
   * piuparts-slave.py:
     - support looping trough multiple sections in slave.conf via new config 
       value "sections". Thanks to Frank Ploss for writing this patch with me