From 083f0f4dd585262f1891828d1635522392f996f9 Mon Sep 17 00:00:00 2001
From: fsgqa <fsgqa>
Date: Wed, 8 May 2002 05:45:22 +0000
Subject: [PATCH] fix bruce's remote tape setup, remove couple of old QA
 machines now used for other duties.

---
 common.config | 19 +------------------
 tools/auto-qa | 49 +++++++++++++++++++++++++------------------------
 2 files changed, 26 insertions(+), 42 deletions(-)

diff --git a/common.config b/common.config
index 4df0af02..f5addd72 100644
--- a/common.config
+++ b/common.config
@@ -81,17 +81,6 @@ _readlink()
 
 case `hostname -s`
 in
-    fuzzy)
-        TEST_DEV=/dev/sda6
-	TEST_DIR=/mnt/xfs1
-	SCRATCH_DEV=/dev/sda5
-	SCRATCH_MNT=/mnt/xfs0
-	SCRATCH_LOGDEV=/dev/sda7
-	TAPE_DEV=/dev/st0
-	RMT_TAPE_DEV=fuzzy:/dev/st0
-	RMT_IRIXTAPE_DEV=snort:/dev/tape
-	RMT_TAPE_USER=guest
-	;;
     bruce)
         TEST_DEV=/dev/sda10
 	TEST_DIR=/mnt/xfs1
@@ -101,6 +90,7 @@ in
 	TAPE_DEV=/dev/st0
 	RMT_TAPE_DEV=bruce:/dev/st0
 	RMT_IRIXTAPE_DEV=snort:/dev/tape
+	RMT_TAPE_USER=guest
 	;;
     sherman)
 	TEST_DEV=/dev/sda10
@@ -160,13 +150,6 @@ in
 	SCRATCH_LOGDEV=/dev/hda10
 	SCRATCH_RTDEV=/dev/hda11
 	;;
-    snowy)
-	TEST_DEV=/dev/sda7
-	TEST_DIR=/mnt/xfs0
-	SCRATCH_DEV=/dev/sda8
-	SCRATCH_MNT=/mnt/xfs1
-	SCRATCH_LOGDEV=/dev/sda9
-	;;
     surly)
         TEST_DEV=/dev/hda9
 	TEST_DIR=/mnt/xfs1
diff --git a/tools/auto-qa b/tools/auto-qa
index 79a00a7c..a5fce01a 100755
--- a/tools/auto-qa
+++ b/tools/auto-qa
@@ -74,9 +74,9 @@ _fail()
 
 _get_kernel_version()
 {
-    [ -x $WORKAREA ] \
+    [ -x "$WORKAREA" ] \
         || _fail "can't access workarea $WORKAREA"
-    [ -r $WORKAREA/linux/Makefile ] \
+    [ -r "$WORKAREA/linux/Makefile" ] \
         || _fail "can't read makefile $WORKAREA/linux/Makefile"
 
     eval `awk '
@@ -205,7 +205,7 @@ _sudo()
 
 _restart()
 {
-    exec $ROOT/su -c "(shutdown -r 1 \"auto-qa rebooting\" )&" < /dev/null
+    exec $ROOT/su -c "(shutdown -r now \"auto-qa rebooting\" )&" < /dev/null
 }
 
 _update_autoqa_file()
@@ -265,7 +265,7 @@ in
     cron-restarted)
         # we don't auto restart after reboot, but cron the restart
         # to happen a bit later - it's much easier and safer that way
-        if [ $state != "cron-restarted" ]
+        if [ "$state" != "cron-restarted" ]
         then
             _fail "    !!! cron-restarted while not in \"cron-restarted\" state"
         fi
@@ -277,11 +277,11 @@ then
     _set_state $1
 fi
 
-[ $UID -eq 0 ]          && _fail "    !!! QA most be run as a normal user"
-[ -d $ROOT ]            || _fail "    !!! QA root \"$ROOT\" not found"
-[ -d $WORKAREA ]        || _fail "    !!! QA workarea \"$WORKAREA\" not found"
-[ -r $CONFIG ]          || _fail "    !!! Can't read config file $CONFIG"
-. $COMMON_CONFIG 	|| _fail "    !!! Couldn't source $COMMON_CONFIG"
+[ "$UID" -eq 0 ]	&& _fail "    !!! QA most be run as a normal user"
+[ -d "$ROOT" ]		|| _fail "    !!! QA root \"$ROOT\" not found"
+[ -d "$WORKAREA" ]	|| _fail "    !!! QA workarea \"$WORKAREA\" not found"
+[ -r "$CONFIG" ]	|| _fail "    !!! Can't read config file $CONFIG"
+. "$COMMON_CONFIG" 	|| _fail "    !!! Couldn't source $COMMON_CONFIG"
 
 _get_kernel_version
 IMAGE="$BOOT/vmlinuz$EXTRA"
@@ -366,20 +366,10 @@ do
             make EXTRAVERSION=$EXTRA dep 2>&1 \
                         || _fail "            !!! reconfig dep failed"
 
-            new_state="build"
+            new_state="buildtools"
             ;;
             
-        *build)
-            _log "        *** build kernel"
-            
-            _change_state "clean" ; # we better start from scratch if this fails
-            
-            cd $WORKAREA/linux
-            make -j2 EXTRAVERSION=$EXTRA bzImage 2>&1 \
-                        || _fail "            !!! build bzImage failed"
-            make -j2 EXTRAVERSION=$EXTRA modules 2>&1 \
-                        || _fail "            !!! build modules failed"
-                                    
+        *buildtools)
             _log "        *** build and install tools"
             for pkg in attr acl xfsprogs dmapi xfsdump xfstests 
             do
@@ -396,14 +386,25 @@ do
                         || _fail "            !!! install $pkg failed"
 
 		# attr and acl now have install-lib targets as well
-		[ $pkg == "attr" -o $pkg == "acl" ] || continue
+		[ "$pkg" == "attr" -o "$pkg" == "acl" ] || continue
 		_sudo make install-lib 2>&1 \
 			|| _fail "            !!! install $pkg failed"
             done
 
-            new_state="install"
+            new_state="buildkernel"
             ;;
+
+        *buildkernel)
+            _log "        *** build kernel"
+            
+            _change_state "clean" ; # we better start from scratch if this fails
             
+            cd $WORKAREA/linux
+            make -j4 EXTRAVERSION=$EXTRA bzImage modules 2>&1 \
+                        || _fail "            !!! build bzImage/modules failed"
+            new_state="install"
+            ;;
+
         *install)
             _log "        *** blat old modules"
             
@@ -454,7 +455,7 @@ do
             ls -l /lib/modules/$SVERSION$EXTRA/kernel/fs/xfs/* \
                   /lib/modules/$SVERSION$EXTRA/kernel/fs/xfs_support/* 
             
-            if [ $MODULAR -eq 0 ]
+            if [ "$MODULAR" -eq 0 ]
             then
                 new_state="reset"
             else
-- 
2.39.5