summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksandar Todorov <atodorov@redhat.com>2010-03-05 12:36:35 +0000
committerAleksandar Todorov <atodorov@redhat.com>2010-03-05 12:36:35 +0000
commit3c0cfcc7343c04839ea892209ce9c7411dc6173d (patch)
tree612ef01752eebb3d14056d59f9e633bc52b0f9f2
parent72de655cd1a3182ee95d468ab5e88052f24a98c6 (diff)
upload bootloader config file if present and bump versionrh-tests-distribution-install-default-1_10-2
-rw-r--r--Tasks/distribution/install/default/Makefile2
-rwxr-xr-xTasks/distribution/install/default/runtest.sh18
2 files changed, 19 insertions, 1 deletions
diff --git a/Tasks/distribution/install/default/Makefile b/Tasks/distribution/install/default/Makefile
index 10eeb23..257a838 100644
--- a/Tasks/distribution/install/default/Makefile
+++ b/Tasks/distribution/install/default/Makefile
@@ -18,7 +18,7 @@ RELATIVE_PATH=install
# will remain /distribution/install
# Required variables
-export TESTVERSION=1.9
+export TESTVERSION=1.10
export TEST=$(TOPLEVEL_NAMESPACE)/$(RELATIVE_PATH)
TEST_DIR=/mnt/tests$(TEST)
BINFILE=hvm_detect
diff --git a/Tasks/distribution/install/default/runtest.sh b/Tasks/distribution/install/default/runtest.sh
index 1255957..8eb8d13 100755
--- a/Tasks/distribution/install/default/runtest.sh
+++ b/Tasks/distribution/install/default/runtest.sh
@@ -159,6 +159,24 @@ SysReport ()
syskerror5=$(/bin/grep -i FATAL: $FILEAREA/install_kernel.log >> $FILEAREA/kerror.log)
syskerror6=$(/bin/grep -i WARNING: $FILEAREA/install_kernel.log >> $FILEAREA/kerror.log)
fi
+
+ # upload bootloader config files
+ if [ -e /boot/grub/grub.conf ]; then
+ rhts_submit_log -S $RESULT_SERVER -T $TESTID -l /boot/grub/grub.conf
+ fi
+
+ if [ -e /boot/efi/efi/redhat/elilo.conf ]; then
+ rhts_submit_log -S $RESULT_SERVER -T $TESTID -l /boot/efi/efi/redhat/elilo.conf
+ fi
+
+ if [ -e /etc/yaboot.conf ]; then
+ rhts_submit_log -S $RESULT_SERVER -T $TESTID -l /etc/yaboot.conf
+ fi
+
+ if [ -e /etc/zipl.conf ]; then
+ rhts_submit_log -S $RESULT_SERVER -T $TESTID -l /etc/zipl.conf
+ fi
+
echo "********** System Information **********" >> $OUTPUTFILE
echo "Hostname = $sysnode" >> $OUTPUTFILE
echo "Kernel Version = $syskernel" >> $OUTPUTFILE