autotests: work in progress

diff --git a/liveboot_gw_autotest.sh b/liveboot_gw_autotest.sh
index d7fef5a154ccd2b85a49e7553e952fecdb1a9e81..8a3d9c19e50fbc210c59c6023a199b570aa803a4 100755 (executable)
--- a/liveboot_gw_autotest.sh
+++ b/liveboot_gw_autotest.sh
@@ -3,6 +3,11 @@
 # copyright 2013 Holger Levsen <holger@layer-acht.org>
 # GPL2 licenced
 
+if [ "$(id -n -u)" != "jenkins" ] ; then
+       echo "You must run this as user jenkins, exiting."
+       exit 1
+fi
+
 set -e
 set -x
 export
@@ -11,19 +16,34 @@ CORE_ROUTER=cr13
 GATEWAY=gw1301
 PSERVER=pserver1301
 
+#
+# prepare ssh
+#
+TMPFILE=$(mktemp)
+ssh-agent > $TMPFILE
+source $TMPFILE
+ssh-add ~/.ssh/id_ritest
+
 #
 # prepare pserver
 #
-ssh -i ~/.ssh/id_ritest $PSERVER "sudo dmsetup remove_all"
-ssh -i ~/.ssh/id_ritest $PSERVER "sudo mkdir -p /mnt/local_hdd"
-ssh -i ~/.ssh/id_ritest $PSERVER "sudo mount /dev/sda1 -t ext3 /mnt/local_hdd"
+ssh -t $PSERVER "sudo dmsetup remove_all"
+ssh -t $PSERVER "sudo mkdir -p /mnt/local_hdd"
+ssh -t $PSERVER "sudo umount /mnt/local_hdd || true"
+ssh -t $PSERVER "sudo mount /dev/sda1 -t ext3 /mnt/local_hdd"
 
 #
 # prepare core router
 #
-ssh -i ~/.ssh/id_ritest $CORE_ROUTER "sudo rm /opt/autotest -rf"
-ssh -i ~/.ssh/id_ritest $CORE_ROUTER "git clone git://git/ri/autotest.git /opt/autotest"
-ssh -i ~/.ssh/id_ritest $CORE_ROUTER "cd /opt/autotest ; git checkout develop"
-ssh -A -i ~/.ssh/id_ritest $CORE_ROUTER "cd /opt/autotest ; ./run-compile.sh --config config-jenkins.xml"
+ssh -t $CORE_ROUTER "sudo rm /opt/autotest -rf"
+ssh -t $CORE_ROUTER "git clone git://git/ri/autotest.git /opt/autotest"
+ssh -t $CORE_ROUTER "cd /opt/autotest ; git checkout develop"
+
+#
+# run autotests
+#
+ssh -t $CORE_ROUTER "cd /opt/autotest ; cp config-jenkins.xml config.xml"
+#ssh -t -A $CORE_ROUTER "cd /opt/autotest ; ./run-compile.sh --config config-jenkins.xml"
+ssh -t -A $CORE_ROUTER "cd /opt/autotest ; ./run-compile.sh"