[Fai-commit] r5461 - in trunk: debian lib

[Thomas Lange]

Author: lange
Date: 2009-07-20 11:54:59 +0000 (Mon, 20 Jul 2009)
New Revision: 5461

Modified:
   trunk/debian/NEWS
   trunk/debian/changelog
   trunk/lib/subroutines
   trunk/lib/subroutines-linux
Log:
  if NEXTTEST is used, define a class for next reboot. Thanks to
  Sebastian Hetze for this patch.
  fill task_tests with code

Modified: trunk/debian/NEWS
===================================================================
--- trunk/debian/NEWS	2009-07-20 11:12:37 UTC (rev 5460)
+++ trunk/debian/NEWS	2009-07-20 11:54:59 UTC (rev 5461)
@@ -1,8 +1,9 @@
 fai (3.2.XXX) unstable; urgency=low
 
   - variable FAI_CONFIGDIR moved from fai.conf to make-fai-nfsroot.conf
+  - automatic tests are now supported
   
- -- Thomas Lange <lange at debian.org>  Sun, 19 Jul 2009 18:54:11 +0200
+ -- Thomas Lange <lange at debian.org>  Mon, 20 Jul 2009 13:55:01 +0200
 
 fai (3.2.8) unstable; urgency=low
 

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-07-20 11:12:37 UTC (rev 5460)
+++ trunk/debian/changelog	2009-07-20 11:54:59 UTC (rev 5461)
@@ -3,7 +3,10 @@
   [ Thomas Lange ]
   * subroutines-linux: fix log message
     remove yes pipe when calling debootstrap
+    if NEXTTEST is used, define a class for next reboot. Thanks to
+    Sebastian Hetze for this patch.
   * subroutines: do not unset the functions task_$taskname after use
+    fill task_tests with code
   * fai-class: add string warning to message
   * task_sysinfo: call blkid on all disks
   * fcopy.8: improve info for calling postinst

Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2009-07-20 11:12:37 UTC (rev 5460)
+++ trunk/lib/subroutines	2009-07-20 11:54:59 UTC (rev 5461)
@@ -410,7 +410,7 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 task_test() {
 
-    echo "Will be implemented soon"
+    fai-do-scripts $FAI/tests
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 task_savelog() {

Modified: trunk/lib/subroutines-linux
===================================================================
--- trunk/lib/subroutines-linux	2009-07-20 11:12:37 UTC (rev 5460)
+++ trunk/lib/subroutines-linux	2009-07-20 11:54:59 UTC (rev 5461)
@@ -301,6 +301,7 @@
     local hostname=$(hostname)
     local ipaddr=$(grep IPADDR $LOGDIR/boot.log | cut -d'=' -f2 | sed "s/'//g")
     local remotesh
+    local nexttest=$(grep -s NEXTTEST $LOGDIR/test.log | cut -d= -f2)
 
     case "$FAI_LOGPROTO" in
 	ftp) remotesh=ssh ;;
@@ -328,8 +329,14 @@
 	    task_error 3
 	    echo "WARNING: $frsh failed. Can't call fai-chboot on the install server."
 	else
-	    # remove pxe config, so host will use default and boot from local disk
-	    $frsh /usr/sbin/fai-chboot -vd $ipaddr
+	    if [ -n "$nexttest" ]; then
+		# for test sequences, we want the system to reinstall immediately with
+		# with different class setup
+		$frsh /usr/sbin/fai-chboot -k ADDCLASSES=$nexttest -FIv $ipaddr
+	    else
+		# remove pxe config, so host will use default and boot from local disk
+		$frsh /usr/sbin/fai-chboot -vd $ipaddr
+	    fi
 	fi
     fi
 }