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

[Holger Levsen]

Author: holger
Date: 2009-04-05 12:48:47 +0000 (Sun, 05 Apr 2009)
New Revision: 320

Modified:
   piatti/README.txt
   piatti/home/piupartss/bin/slave_join
   piatti/home/piupartss/bin/slave_run
   piatti/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
Log:
make it work ;-) aka fix logical errors

Modified: piatti/README.txt
===================================================================
--- piatti/README.txt	2009-04-05 12:36:33 UTC (rev 319)
+++ piatti/README.txt	2009-04-05 12:48:47 UTC (rev 320)
@@ -67,18 +67,31 @@
 
 === Starting the slave
 
-Use the following command to start piuparts-slave on piatti, piuparts-master will be started automatically by the slave.
+Run the following script under *your* user account you will start piuparts-slave on piatti, piuparts-master will be started automatically by the slave.
 
 ----
-piupartss at piatti:~$ slave_run
+holger at piatti:~$ sudo /home/piupartss/bin/slave_run 
 ----
 
 There is a cronjob installed (in '~piupartsm/crontab') which sends a mail with the tail of the session every six hours.
 
+=== Joining an existing slave session
+
+Run the following script under *your* user account:
+
+----
+holger at piatti:~$ sudo /home/piupartss/bin/slave_join 
+----
+
 === Filing bugs
 
-to be written
+Use the following usertags:
 
+----
+User: debian-qa at lists.debian.org
+Usertags: piuparts piuparts.d.o
+----
+
 === Generating reports for the website
 
 'piuparts-report' is run daily five minutes after midnight from '~piupartsm/crontab'

Modified: piatti/home/piupartss/bin/slave_join
===================================================================
--- piatti/home/piupartss/bin/slave_join	2009-04-05 12:36:33 UTC (rev 319)
+++ piatti/home/piupartss/bin/slave_join	2009-04-05 12:48:47 UTC (rev 320)
@@ -3,5 +3,5 @@
 # reattach to an existing slave session
 #
 set -e
-sudo screen -R -S piuparts-slave-screen
+screen -R -S piuparts-slave-screen
 

Modified: piatti/home/piupartss/bin/slave_run
===================================================================
--- piatti/home/piupartss/bin/slave_run	2009-04-05 12:36:33 UTC (rev 319)
+++ piatti/home/piupartss/bin/slave_run	2009-04-05 12:48:47 UTC (rev 320)
@@ -1,10 +1,10 @@
-#!/bin/sh 
+#!/bin/sh -x
 #
 # run piuparts-slave in screen so that a screendump can be mailed via cron to monitor the slave
 #
 set -e
 cd /org/piuparts.debian.org/slave
-(ps fax|grep -v grep| grep piuparts-slave.py ) || exit 0
-sudo rm /org/piuparts.debian.org/slave/screenlog.0
-sudo screen -L -d -m -S piuparts-slave-screen su - piupartss -c "cd /org/piuparts.debian.org/slave && python ../share/piuparts/piuparts-slave"
+(ps fax|grep -v grep| grep piuparts-slave ) && exit 0
+rm -f /org/piuparts.debian.org/slave/screenlog.0
+screen -L -d -m -S piuparts-slave-screen su - piupartss -c "cd /org/piuparts.debian.org/slave && python ../share/piuparts/piuparts-slave"
 

Modified: piatti/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
===================================================================
--- piatti/org/piuparts.debian.org/etc/piuparts.conf.goldwasser	2009-04-05 12:36:33 UTC (rev 319)
+++ piatti/org/piuparts.debian.org/etc/piuparts.conf.goldwasser	2009-04-05 12:48:47 UTC (rev 320)
@@ -15,6 +15,7 @@
 description = Debian sid / main, installation and removal tests
 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 --no-symlinks --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
 distro = sid
@@ -28,6 +29,7 @@
 description = Debian squeeze / main, installation and removal tests as well as installation in lenny and upgrade to squeze and then removal tests
 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
 mirror = http://ftp.de.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