[Piuparts-commits] [SCM] piuparts git repository branch, bikeshed, updated. 0.50-192-g27ab6cb

[Holger Levsen]

The following commit has been merged in the bikeshed branch:
commit 7bd069f981dd2246e67a90d7e889cc584948a90e
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun May 12 18:07:37 2013 +0200

    p-s: exit gracefully if no sections were found
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/README_pejacevic.txt b/README_pejacevic.txt
index 101a596..ca5201d 100644
--- a/README_pejacevic.txt
+++ b/README_pejacevic.txt
@@ -7,11 +7,15 @@ Notes about the piuparts installation on pejacevic.debian.org and it's slave
 
 == Installation
 
+piuparts.debian.org is a setup running on two systems: pejacevic.debian.org, running the piuparts-master instance and an apache webserver to display the results and piu-slave-bm-a.debian.org, running a piuparts-slave node. Hopefully soon there should be several slave-nodes running on that system.
+
 === User setup
 
-A piupartss and a piupartsm user is need. Both are members of the group piuparts and /srv/piuparts.debian.org is 774 piupartss:piuparts.
+A piupartss (on piu-slave-bm-a) and a piupartsm (on pejacevic) user is needed. Both are members of the group piuparts and /srv/piuparts.debian.org is 774 piupartss:piuparts.
 Both user have some files in $HOME which are kept in git, including hidden files.
 
+FIXME: this needs to be added to ~/.bashrc: export PATH="~/bin:$PATH"
+
 Create an SSH keypair for piupartss and put it into ~/.ssh/authorized_keys of the piupartsm user, so the piupartss can login with ssh to localhost as piupartsm.
 
 === '/etc/sudoers' for piatti
@@ -27,7 +31,7 @@ piupartss       ALL = NOPASSWD: ALL
 
 === piuparts installation from source
 
-* sudo apt-get install apt python debootstrap lsof lsb-release python-debian asciidoc xmlto python-rpy r-recommended r-base-dev gs
+* sudo apt-get build-dep piuparts
 * you need a webserver too, if you run the master
 * Copy 'http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=develop;a=blob_plain;f=update-piuparts-setup' on the host and run it under the 'piupartss' user. It assumes you want to set it up in '/srv/piuparts.debian.org' and does all further updates from git as well as the initial installation. It needs the piupartss and piupartsm user set up as described below, though.
 * mkdir /srv/piuparts.debian.org
@@ -39,7 +43,6 @@ piupartss       ALL = NOPASSWD: ALL
 ----
 <VirtualHost *:80>
         ServerName piuparts.debian.org
-        ServerAlias piuparts.cs.helsinki.fi
 
         ServerAdmin debian-admin at debian.org
 
@@ -61,18 +64,26 @@ piupartss       ALL = NOPASSWD: ALL
 
 == Updating the piuparts installation
 
+Updating the master, pejacevic:
+
+----
+holger at pejacevic$ sudo su - piupartsm update-piuparts-master-setup pejacevic origin
+----
+
+Updating the slave, pejacevic:
+
 ----
-piupartss at piatti:/srv/piuparts.debian.org$ ~/bin/update-piuparts-setup
+holger at piu-slave-bm-a$ sudo su - piupartss update-piuparts-slave-setup pejacevic origin
 ----
 
 == Running piuparts
 
 === Starting and stopping 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.
+Run the following script under *your* user account you will start piuparts-slave on pejacevic, piuparts-master will be started automatically by the slave.
 
 ----
-holger at piatti:~$ sudo /home/piupartss/bin/slave_run
+holger at pejacevic:~$ sudo -u piupartss -i slave_run
 ----
 
 There are several cronjobs installed via '~piupartsm/crontab' and
@@ -89,7 +100,7 @@ but that may leave temporary directories and processes around.
 Run the following script under *your* user account:
 
 ----
-holger at piatti:~$ sudo /home/piupartss/bin/slave_join
+holger at pejacevic:~$ sudo -u piupartss -i slave_join
 ----
 
 === Filing bugs
@@ -103,7 +114,7 @@ Usertags: piuparts piuparts.d.o
 
 === Generating reports for the website
 
-'piuparts-report' is run daily five minutes after midnight from '~piupartsm/crontab'
+'piuparts-report' is run daily five minutes after midnight from '~piupartsm/crontab' on pejacevic.
 
 === Cronjobs to aid problem spotting
 
@@ -117,9 +128,8 @@ More checks should be added as we become aware of them.
 
 == Authors
 
-Last updated: June 2012
+Last updated: May 2013
 
 Holger Levsen <holger at debian.org>
-Luk Claes <luk at debian.org>
 
 // vim: set filetype=asciidoc:
diff --git a/piuparts-slave.py b/piuparts-slave.py
index e4ab749..c5c7f00 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -878,6 +878,10 @@ def main():
             # ignore unknown sections
             pass
 
+    if not sections:
+        logging.error("no sections found")
+        return
+
     while True:
         global got_sighup
         test_count = 0

-- 
piuparts git repository