fix bruce's remote tape setup, remove couple of old QA machines now used

for other duties.
This commit is contained in:
fsgqa
2002-05-08 05:45:22 +00:00
parent b1095283a1
commit 083f0f4dd5
2 changed files with 26 additions and 42 deletions
+1 -18
View File
@@ -81,17 +81,6 @@ _readlink()
case `hostname -s` case `hostname -s`
in 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) bruce)
TEST_DEV=/dev/sda10 TEST_DEV=/dev/sda10
TEST_DIR=/mnt/xfs1 TEST_DIR=/mnt/xfs1
@@ -101,6 +90,7 @@ in
TAPE_DEV=/dev/st0 TAPE_DEV=/dev/st0
RMT_TAPE_DEV=bruce:/dev/st0 RMT_TAPE_DEV=bruce:/dev/st0
RMT_IRIXTAPE_DEV=snort:/dev/tape RMT_IRIXTAPE_DEV=snort:/dev/tape
RMT_TAPE_USER=guest
;; ;;
sherman) sherman)
TEST_DEV=/dev/sda10 TEST_DEV=/dev/sda10
@@ -160,13 +150,6 @@ in
SCRATCH_LOGDEV=/dev/hda10 SCRATCH_LOGDEV=/dev/hda10
SCRATCH_RTDEV=/dev/hda11 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) surly)
TEST_DEV=/dev/hda9 TEST_DEV=/dev/hda9
TEST_DIR=/mnt/xfs1 TEST_DIR=/mnt/xfs1
+25 -24
View File
@@ -74,9 +74,9 @@ _fail()
_get_kernel_version() _get_kernel_version()
{ {
[ -x $WORKAREA ] \ [ -x "$WORKAREA" ] \
|| _fail "can't access workarea $WORKAREA" || _fail "can't access workarea $WORKAREA"
[ -r $WORKAREA/linux/Makefile ] \ [ -r "$WORKAREA/linux/Makefile" ] \
|| _fail "can't read makefile $WORKAREA/linux/Makefile" || _fail "can't read makefile $WORKAREA/linux/Makefile"
eval `awk ' eval `awk '
@@ -205,7 +205,7 @@ _sudo()
_restart() _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() _update_autoqa_file()
@@ -265,7 +265,7 @@ in
cron-restarted) cron-restarted)
# we don't auto restart after reboot, but cron the restart # we don't auto restart after reboot, but cron the restart
# to happen a bit later - it's much easier and safer that way # to happen a bit later - it's much easier and safer that way
if [ $state != "cron-restarted" ] if [ "$state" != "cron-restarted" ]
then then
_fail " !!! cron-restarted while not in \"cron-restarted\" state" _fail " !!! cron-restarted while not in \"cron-restarted\" state"
fi fi
@@ -277,11 +277,11 @@ then
_set_state $1 _set_state $1
fi fi
[ $UID -eq 0 ] && _fail " !!! QA most be run as a normal user" [ "$UID" -eq 0 ] && _fail " !!! QA most be run as a normal user"
[ -d $ROOT ] || _fail " !!! QA root \"$ROOT\" not found" [ -d "$ROOT" ] || _fail " !!! QA root \"$ROOT\" not found"
[ -d $WORKAREA ] || _fail " !!! QA workarea \"$WORKAREA\" not found" [ -d "$WORKAREA" ] || _fail " !!! QA workarea \"$WORKAREA\" not found"
[ -r $CONFIG ] || _fail " !!! Can't read config file $CONFIG" [ -r "$CONFIG" ] || _fail " !!! Can't read config file $CONFIG"
. $COMMON_CONFIG || _fail " !!! Couldn't source $COMMON_CONFIG" . "$COMMON_CONFIG" || _fail " !!! Couldn't source $COMMON_CONFIG"
_get_kernel_version _get_kernel_version
IMAGE="$BOOT/vmlinuz$EXTRA" IMAGE="$BOOT/vmlinuz$EXTRA"
@@ -366,20 +366,10 @@ do
make EXTRAVERSION=$EXTRA dep 2>&1 \ make EXTRAVERSION=$EXTRA dep 2>&1 \
|| _fail " !!! reconfig dep failed" || _fail " !!! reconfig dep failed"
new_state="build" new_state="buildtools"
;; ;;
*build) *buildtools)
_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"
_log " *** build and install tools" _log " *** build and install tools"
for pkg in attr acl xfsprogs dmapi xfsdump xfstests for pkg in attr acl xfsprogs dmapi xfsdump xfstests
do do
@@ -396,14 +386,25 @@ do
|| _fail " !!! install $pkg failed" || _fail " !!! install $pkg failed"
# attr and acl now have install-lib targets as well # 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 \ _sudo make install-lib 2>&1 \
|| _fail " !!! install $pkg failed" || _fail " !!! install $pkg failed"
done done
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" new_state="install"
;; ;;
*install) *install)
_log " *** blat old modules" _log " *** blat old modules"
@@ -454,7 +455,7 @@ do
ls -l /lib/modules/$SVERSION$EXTRA/kernel/fs/xfs/* \ ls -l /lib/modules/$SVERSION$EXTRA/kernel/fs/xfs/* \
/lib/modules/$SVERSION$EXTRA/kernel/fs/xfs_support/* /lib/modules/$SVERSION$EXTRA/kernel/fs/xfs_support/*
if [ $MODULAR -eq 0 ] if [ "$MODULAR" -eq 0 ]
then then
new_state="reset" new_state="reset"
else else