[27173] in Source-Commits
/svn/athena r25993 - in trunk/debathena/scripts/tests/installer: . isolinux
daemon@ATHENA.MIT.EDU (Sean P. Preston)
Fri May 17 16:01:14 2013
Date: Fri, 17 May 2013 16:01:07 -0400
From: "Sean P. Preston" <wpreston@MIT.EDU>
Message-Id: <201305172001.r4HK17nr016265@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: wpreston
Date: 2013-05-17 16:01:06 -0400 (Fri, 17 May 2013)
New Revision: 25993
Removed:
trunk/debathena/scripts/tests/installer/isolinux/16x16.fnt
trunk/debathena/scripts/tests/installer/isolinux/access.pcx
trunk/debathena/scripts/tests/installer/isolinux/adtxt.cfg
trunk/debathena/scripts/tests/installer/isolinux/am.tr
trunk/debathena/scripts/tests/installer/isolinux/ast.hlp
trunk/debathena/scripts/tests/installer/isolinux/ast.tr
trunk/debathena/scripts/tests/installer/isolinux/back.jpg
trunk/debathena/scripts/tests/installer/isolinux/be.hlp
trunk/debathena/scripts/tests/installer/isolinux/be.tr
trunk/debathena/scripts/tests/installer/isolinux/bg.hlp
trunk/debathena/scripts/tests/installer/isolinux/bg.tr
trunk/debathena/scripts/tests/installer/isolinux/blank.pcx
trunk/debathena/scripts/tests/installer/isolinux/bn.hlp
trunk/debathena/scripts/tests/installer/isolinux/boot.cat
trunk/debathena/scripts/tests/installer/isolinux/bootlogo
trunk/debathena/scripts/tests/installer/isolinux/bs.hlp
trunk/debathena/scripts/tests/installer/isolinux/bs.tr
trunk/debathena/scripts/tests/installer/isolinux/ca.hlp
trunk/debathena/scripts/tests/installer/isolinux/ca.tr
trunk/debathena/scripts/tests/installer/isolinux/chain.c32
trunk/debathena/scripts/tests/installer/isolinux/cs.hlp
trunk/debathena/scripts/tests/installer/isolinux/cs.tr
trunk/debathena/scripts/tests/installer/isolinux/da.hlp
trunk/debathena/scripts/tests/installer/isolinux/da.tr
trunk/debathena/scripts/tests/installer/isolinux/de.hlp
trunk/debathena/scripts/tests/installer/isolinux/de.tr
trunk/debathena/scripts/tests/installer/isolinux/dtmenu.cfg
trunk/debathena/scripts/tests/installer/isolinux/el.hlp
trunk/debathena/scripts/tests/installer/isolinux/el.tr
trunk/debathena/scripts/tests/installer/isolinux/en.hlp
trunk/debathena/scripts/tests/installer/isolinux/en.tr
trunk/debathena/scripts/tests/installer/isolinux/eo.hlp
trunk/debathena/scripts/tests/installer/isolinux/eo.tr
trunk/debathena/scripts/tests/installer/isolinux/es.hlp
trunk/debathena/scripts/tests/installer/isolinux/es.tr
trunk/debathena/scripts/tests/installer/isolinux/et.hlp
trunk/debathena/scripts/tests/installer/isolinux/et.tr
trunk/debathena/scripts/tests/installer/isolinux/eu.hlp
trunk/debathena/scripts/tests/installer/isolinux/eu.tr
trunk/debathena/scripts/tests/installer/isolinux/exithelp.cfg
trunk/debathena/scripts/tests/installer/isolinux/f1.txt
trunk/debathena/scripts/tests/installer/isolinux/f10.txt
trunk/debathena/scripts/tests/installer/isolinux/f2.txt
trunk/debathena/scripts/tests/installer/isolinux/f3.txt
trunk/debathena/scripts/tests/installer/isolinux/f4.txt
trunk/debathena/scripts/tests/installer/isolinux/f5.txt
trunk/debathena/scripts/tests/installer/isolinux/f6.txt
trunk/debathena/scripts/tests/installer/isolinux/f7.txt
trunk/debathena/scripts/tests/installer/isolinux/f8.txt
trunk/debathena/scripts/tests/installer/isolinux/f9.txt
trunk/debathena/scripts/tests/installer/isolinux/fa.tr
trunk/debathena/scripts/tests/installer/isolinux/fi.hlp
trunk/debathena/scripts/tests/installer/isolinux/fi.tr
trunk/debathena/scripts/tests/installer/isolinux/fr.hlp
trunk/debathena/scripts/tests/installer/isolinux/fr.tr
trunk/debathena/scripts/tests/installer/isolinux/ga.tr
trunk/debathena/scripts/tests/installer/isolinux/gfxboot.c32
trunk/debathena/scripts/tests/installer/isolinux/gfxboot.cfg
trunk/debathena/scripts/tests/installer/isolinux/gl.hlp
trunk/debathena/scripts/tests/installer/isolinux/gl.tr
trunk/debathena/scripts/tests/installer/isolinux/he.hlp
trunk/debathena/scripts/tests/installer/isolinux/he.tr
trunk/debathena/scripts/tests/installer/isolinux/hi.hlp
trunk/debathena/scripts/tests/installer/isolinux/hr.tr
trunk/debathena/scripts/tests/installer/isolinux/hu.hlp
trunk/debathena/scripts/tests/installer/isolinux/hu.tr
trunk/debathena/scripts/tests/installer/isolinux/id.hlp
trunk/debathena/scripts/tests/installer/isolinux/id.tr
trunk/debathena/scripts/tests/installer/isolinux/is.hlp
trunk/debathena/scripts/tests/installer/isolinux/is.tr
trunk/debathena/scripts/tests/installer/isolinux/isolinux.bin
trunk/debathena/scripts/tests/installer/isolinux/it.hlp
trunk/debathena/scripts/tests/installer/isolinux/it.tr
trunk/debathena/scripts/tests/installer/isolinux/ja.hlp
trunk/debathena/scripts/tests/installer/isolinux/ja.tr
trunk/debathena/scripts/tests/installer/isolinux/ka.hlp
trunk/debathena/scripts/tests/installer/isolinux/ka.tr
trunk/debathena/scripts/tests/installer/isolinux/kk.hlp
trunk/debathena/scripts/tests/installer/isolinux/kk.tr
trunk/debathena/scripts/tests/installer/isolinux/km.hlp
trunk/debathena/scripts/tests/installer/isolinux/kn.tr
trunk/debathena/scripts/tests/installer/isolinux/ko.hlp
trunk/debathena/scripts/tests/installer/isolinux/ko.tr
trunk/debathena/scripts/tests/installer/isolinux/ku.tr
trunk/debathena/scripts/tests/installer/isolinux/langlist
trunk/debathena/scripts/tests/installer/isolinux/lo.tr
trunk/debathena/scripts/tests/installer/isolinux/lt.hlp
trunk/debathena/scripts/tests/installer/isolinux/lt.tr
trunk/debathena/scripts/tests/installer/isolinux/lv.hlp
trunk/debathena/scripts/tests/installer/isolinux/lv.tr
trunk/debathena/scripts/tests/installer/isolinux/menu.cfg
trunk/debathena/scripts/tests/installer/isolinux/mk.tr
trunk/debathena/scripts/tests/installer/isolinux/mr.tr
trunk/debathena/scripts/tests/installer/isolinux/nb.hlp
trunk/debathena/scripts/tests/installer/isolinux/nb.tr
trunk/debathena/scripts/tests/installer/isolinux/nl.hlp
trunk/debathena/scripts/tests/installer/isolinux/nl.tr
trunk/debathena/scripts/tests/installer/isolinux/nn.hlp
trunk/debathena/scripts/tests/installer/isolinux/nn.tr
trunk/debathena/scripts/tests/installer/isolinux/pl.hlp
trunk/debathena/scripts/tests/installer/isolinux/pl.tr
trunk/debathena/scripts/tests/installer/isolinux/po4a.cfg
trunk/debathena/scripts/tests/installer/isolinux/prompt.cfg
trunk/debathena/scripts/tests/installer/isolinux/pt.hlp
trunk/debathena/scripts/tests/installer/isolinux/pt.tr
trunk/debathena/scripts/tests/installer/isolinux/pt_BR.hlp
trunk/debathena/scripts/tests/installer/isolinux/pt_BR.tr
trunk/debathena/scripts/tests/installer/isolinux/ro.hlp
trunk/debathena/scripts/tests/installer/isolinux/ro.tr
trunk/debathena/scripts/tests/installer/isolinux/rqtxt.cfg
trunk/debathena/scripts/tests/installer/isolinux/ru.hlp
trunk/debathena/scripts/tests/installer/isolinux/ru.tr
trunk/debathena/scripts/tests/installer/isolinux/si.hlp
trunk/debathena/scripts/tests/installer/isolinux/si.tr
trunk/debathena/scripts/tests/installer/isolinux/sk.hlp
trunk/debathena/scripts/tests/installer/isolinux/sk.tr
trunk/debathena/scripts/tests/installer/isolinux/sl.hlp
trunk/debathena/scripts/tests/installer/isolinux/sl.tr
trunk/debathena/scripts/tests/installer/isolinux/splash.pcx
trunk/debathena/scripts/tests/installer/isolinux/splash.png
trunk/debathena/scripts/tests/installer/isolinux/sq.hlp
trunk/debathena/scripts/tests/installer/isolinux/sq.tr
trunk/debathena/scripts/tests/installer/isolinux/sr.hlp
trunk/debathena/scripts/tests/installer/isolinux/sr.tr
trunk/debathena/scripts/tests/installer/isolinux/stdmenu.cfg
trunk/debathena/scripts/tests/installer/isolinux/sv.hlp
trunk/debathena/scripts/tests/installer/isolinux/sv.tr
trunk/debathena/scripts/tests/installer/isolinux/te.tr
trunk/debathena/scripts/tests/installer/isolinux/th.hlp
trunk/debathena/scripts/tests/installer/isolinux/tl.tr
trunk/debathena/scripts/tests/installer/isolinux/tr.hlp
trunk/debathena/scripts/tests/installer/isolinux/tr.tr
trunk/debathena/scripts/tests/installer/isolinux/txt.cfg
trunk/debathena/scripts/tests/installer/isolinux/ug.hlp
trunk/debathena/scripts/tests/installer/isolinux/uk.hlp
trunk/debathena/scripts/tests/installer/isolinux/uk.tr
trunk/debathena/scripts/tests/installer/isolinux/vesamenu.c32
trunk/debathena/scripts/tests/installer/isolinux/vi.hlp
trunk/debathena/scripts/tests/installer/isolinux/vi.tr
trunk/debathena/scripts/tests/installer/isolinux/zh_CN.hlp
trunk/debathena/scripts/tests/installer/isolinux/zh_CN.tr
trunk/debathena/scripts/tests/installer/isolinux/zh_TW.hlp
trunk/debathena/scripts/tests/installer/isolinux/zh_TW.tr
Modified:
trunk/debathena/scripts/tests/installer/install-test.sh
Log:
switch to local copy of syslinux. logging changes. stop vm after test completion.
Modified: trunk/debathena/scripts/tests/installer/install-test.sh
===================================================================
--- trunk/debathena/scripts/tests/installer/install-test.sh 2013-05-14 16:53:46 UTC (rev 25992)
+++ trunk/debathena/scripts/tests/installer/install-test.sh 2013-05-17 20:01:06 UTC (rev 25993)
@@ -25,7 +25,6 @@
NOW=$(date +"%d-%m-%y")
LOG=$LOGDIR/"install-test-"$NOW".log"
-
function usage() {
cat<< EO
Usage: -s <suite> -a <architecture> -h <hostname> -i <ip> -p <preseed>
@@ -70,52 +69,50 @@
fi
mkdir $BASEDIR/tmp
+mkdir $BASEDIR/tmp/isolinux
TMPDIR=$BASEDIR/tmp
+
echo "creating build files..." | tee -a $LOG
-cp -R $BASEDIR/isolinux $TMPDIR
-echo "fetching kernel and initrd..." | tee -a $LOG
-wget -q http://mirrors.mit.edu/ubuntu/dists/$SUITE/main/installer-$ARCH/current/images/netboot/ubuntu-installer/$ARCH/linux -O $TMPDIR/linux
-wget -q http://mirrors.mit.edu/ubuntu/dists/$SUITE/main/installer-$ARCH/current/images/netboot/ubuntu-installer/$ARCH/initrd.gz -O $TMPDIR/initrd.gz
+ISOLINUXBIN=/usr/lib/syslinux/isolinux.bin
-ISOLINUXBIN=$TMPDIR/isolinux/isolinux.bin
-ISOLINUXBOOT=$TMPDIR/isolinux/boot.cat
-ISOLINUXCFG=$TMPDIR/isolinux/isolinux.cfg
-
-# sane?
if [ ! -f $ISOLINUXBIN ] ; then
echo "isolinux.bin not found at: $ISOLINUXBIN exiting..." | tee -a $LOG
exit 1
fi
-if [ ! -f $ISOLINUXBOOT ] ; then
- echo "boot.cat not found at: $ISOLINUXBOOT exiting..." | tee -a $LOG
- exit 1
-fi
+cp $ISOLINUXBIN $TMPDIR/isolinux
-if [ ! -f $ISOLINUXCFG ] ; then
- echo "isolinux.cfg not found at: $ISOLINUXCFG exiting..." | tee -a $LOG
+if [ ! -f $BASEDIR/isolinux/isolinux.cfg ] ; then
+ echo "isolinux.cfg not found. exiting..." | tee -a $LOG
exit 1
fi
+cp -R $BASEDIR/isolinux $TMPDIR
+
+ISOLINUXCFG=$TMPDIR/isolinux/isolinux.cfg
+
echo "seeding isolinux.cfg..." | tee -a $LOG
sed -i "s|%HOSTNAME%|$HOSTNAME|g" $ISOLINUXCFG
sed -i "s|%IP%|$IP|g" $ISOLINUXCFG
sed -i "s|%PRESEED%|$PRESEED|g" $ISOLINUXCFG
+echo "fetching kernel and initrd..." | tee -a $LOG
+wget -q http://mirrors.mit.edu/ubuntu/dists/$SUITE/main/installer-$ARCH/current/images/netboot/ubuntu-installer/$ARCH/linux -O $TMPDIR/linux
+wget -q http://mirrors.mit.edu/ubuntu/dists/$SUITE/main/installer-$ARCH/current/images/netboot/ubuntu-installer/$ARCH/initrd.gz -O $TMPDIR/initrd.gz
+
echo "creating iso image..." | tee -a $LOG
IMAGENAME=$SUITE-$ARCH-netboot.iso
-BUILDDIR=$TMPDIR
mkisofs -r -V "Debathena Boot" \
-cache-inodes \
-J -l -b isolinux/isolinux.bin \
-c isolinux/boot.cat -no-emul-boot \
-boot-load-size 4 -boot-info-table \
- -o $IMAGENAME $BUILDDIR 2>&1 | tee -a $LOG
+ -o $IMAGENAME $TMPDIR 2>&1 | tee -a $LOG
if [ ! -f $BASEDIR/$IMAGENAME ] ; then
echo "iso creation failed. exiting..." | tee -a $LOG
@@ -140,15 +137,17 @@
sleep 240m
-ATHINFO_VERSION=`athinfo $IP version`
-ATHINFO_VERSION_PASS=`$ATHINFO_VERSION | grep -c debathena-cluster`
+ATHINFO_VERSION_PASS=`athinfo $HOSTNAME version | grep -c debathena-cluster`
+#TODO: get more useful reporting here. The last messages weren't quite working as expected
if [[ $ATHINFO_VERSION_PASS -ne 1 ]] ; then
- echo "athinfo version returned: $ATHINFO_VERSION. Test Failed." | tee -a $LOG
+ echo "Test Failed." | tee -a $LOG
else
- echo "Test Passed! athinfo version: $ATHINFO_VERSION" | tee -a $LOG
+ echo "Test Passed." | tee -a $LOG
fi
+vmrun stop $TMPDIR/vm/default.vmx 2>&1 | tee -a $LOG
+
echo "done."
exit 0
