[Piuparts-commits] rev 637 - in piatti: home/piupartsm home/piupartss/bin org/piuparts.debian.org/etc

Holger Levsen holger at alioth.debian.org
Mon Jan 25 13:38:44 UTC 2010


Author: holger
Date: 2010-01-25 13:38:42 +0000 (Mon, 25 Jan 2010)
New Revision: 637

Modified:
   piatti/home/piupartsm/crontab
   piatti/home/piupartss/bin/update-piuparts-setup
   piatti/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
   piatti/org/piuparts.debian.org/etc/piuparts.conf.piatti
Log:
- support python 2.5 and 2.6 instead of 2.4 and 2.5
- work in progress for new suite tests (on goldwasser, the developing system, only)


Modified: piatti/home/piupartsm/crontab
===================================================================
--- piatti/home/piupartsm/crontab	2010-01-25 09:09:05 UTC (rev 636)
+++ piatti/home/piupartsm/crontab	2010-01-25 13:38:42 UTC (rev 637)
@@ -4,7 +4,7 @@
 # create reports once a day
 #  (dinstall runs 1|7|13|19:52, so this is long after mirror pushes...)
 #
-0 0 * * * ( /home/piupartsm/bin/detect_well_known_errors ; find /org/piuparts.debian.org/master/*/fail  -type f -mtime 1 -exec ls -rt1 {} \;|sed s#^/org/#http://#g | sed s#/master/#/#g ; 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  2>&1 )  | mail -s piuparts-report piupartsm
+0 0 * * * ( /home/piupartsm/bin/detect_well_known_errors ; find /org/piuparts.debian.org/master/*/fail  -type f -mtime 1 -exec ls -rt1 {} \;|sed s#^/org/#http://#g | sed s#/master/#/#g ; PYTHONPATH=/org/piuparts.debian.org/lib/python2.5/site-packages:/org/piuparts.debian.org/lib/python2.6/site-packages nice python /org/piuparts.debian.org/share/piuparts/piuparts-report  2>&1 )  | mail -s piuparts-report piupartsm
 
 #
 # monitor slave session every hour

Modified: piatti/home/piupartss/bin/update-piuparts-setup
===================================================================
--- piatti/home/piupartss/bin/update-piuparts-setup	2010-01-25 09:09:05 UTC (rev 636)
+++ piatti/home/piupartss/bin/update-piuparts-setup	2010-01-25 13:38:42 UTC (rev 637)
@@ -39,7 +39,7 @@
 svn up
 svn status
 grep -q PYTHONPATH .bashrc || {
-	echo PYTHONPATH=/org/piuparts.debian.org/lib/python2.4/site-packages:/org/piuparts.debian.org/lib/python2.5/site-packages >> .bashrc
+	echo PYTHONPATH=/org/piuparts.debian.org/lib/python2.5/site-packages:/org/piuparts.debian.org/lib/python2.6/site-packages >> .bashrc
 	echo export PYTHONPATH >> .bashrc
 }
 
@@ -56,7 +56,7 @@
 sudo su - piupartsm -c "pwd ; svn up ; svn status"
 sudo su - piupartsm -c "crontab crontab"
 grep -q PYTHONPATH ~piupartsm/.bashrc || {
-	echo PYTHONPATH=/org/piuparts.debian.org/lib/python2.4/site-packages:/org/piuparts.debian.org/lib/python2.5/site-packages >> ~piupartsm/.bashrc
+	echo PYTHONPATH=/org/piuparts.debian.org/lib/python2.5/site-packages:/org/piuparts.debian.org/lib/python2.6/site-packages >> ~piupartsm/.bashrc
 	echo export PYTHONPATH >> ~piupartsm/.bashrc
 }
 

Modified: piatti/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
===================================================================
--- piatti/org/piuparts.debian.org/etc/piuparts.conf.goldwasser	2010-01-25 09:09:05 UTC (rev 636)
+++ piatti/org/piuparts.debian.org/etc/piuparts.conf.goldwasser	2010-01-25 13:38:42 UTC (rev 637)
@@ -6,7 +6,7 @@
 #
 
 [global]
-sections = sid
+sections = lenny2squeeze
 #sections = sid squeeze
 master-host = localhost
 master-user = piupartsm
@@ -16,31 +16,41 @@
 
 [sid]
 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
+master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.5/site-packages:/org/piuparts.debian.org/lib/python2.6/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 --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
+piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --warn-on-others --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 = 25
-log-file = sid-master.log
+log-file = sid.log
 # Once there are no packages left which leave files on purge behind, 
 # --pedantic-purge-test should be added
 
 [squeeze]
-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
+description = Debian squeeze / main: package installation, removal and purge test.
+master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.5/site-packages:/org/piuparts.debian.org/lib/python2.6/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
 mirror = http://ftp.de.debian.org/debian/
-piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
+piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --warn-on-others --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
 distro = squeeze
 chroot-tgz = squeeze.tar.gz
+max-reserved = 25
+log-file = squeeze.log
+
+[lenny2squeeze]
+description = Debian main: package installation in lenny and upgrade to squeeze, 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 lenny2squeeze
+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
+mirror = http://ftp.de.debian.org/debian/
+piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --warn-on-others --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 = 30
-log-file = squeeze-master.log
+max-reserved = 25
+log-file = lenny2squeeze.log
 

Modified: piatti/org/piuparts.debian.org/etc/piuparts.conf.piatti
===================================================================
--- piatti/org/piuparts.debian.org/etc/piuparts.conf.piatti	2010-01-25 09:09:05 UTC (rev 636)
+++ piatti/org/piuparts.debian.org/etc/piuparts.conf.piatti	2010-01-25 13:38:42 UTC (rev 637)
@@ -15,7 +15,7 @@
 
 [sid]
 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
+master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.5/site-packages:/org/piuparts.debian.org/lib/python2.6/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/
@@ -25,13 +25,13 @@
 upgrade-test-distros = 
 upgrade-test-chroot-tgz = 
 max-reserved = 100
-log-file = sid-master.log
+log-file = sid.log
 # Once there are no packages left which leave files on purge behind, 
 # --pedantic-purge-test should be added
 
 [squeeze]
 description = Debian squeeze / main: package installation, removal and purge test as well as package installation in lenny and upgrade to squeeze, 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
+master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.5/site-packages:/org/piuparts.debian.org/lib/python2.6/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/
@@ -41,6 +41,6 @@
 upgrade-test-distros = lenny squeeze
 upgrade-test-chroot-tgz = lenny.tar.gz
 max-reserved = 100
-log-file = squeeze-master.log
+log-file = squeeze.log
 
 




More information about the Piuparts-commits mailing list