Commit 997b2cba authored by Holger Levsen's avatar Holger Levsen

make cd-tests more robust

parent 1e221a2b
......@@ -116,6 +116,14 @@ monitor_installation() {
if [ $(($NR % 150)) -eq 0 ] ; then
vncdo -s localhost:$DISPLAY key ctrl
fi
# if this screenshot is the same as the one 400 screenshots ago, let stop this
if [ $(($NR % 100)) -eq 0 ] ; then
let OLD=nr-400
if test $(diff snapshot_$(printf "%06d" $NR).ppm snapshot_$(printf "%06d" $OLD).ppm 1>/dev/null) ; then
break
fi
fi
done
set -x
if [ $NR -eq 9000 ] ; then
......@@ -130,7 +138,7 @@ trap cleanup_all INT TERM EXIT
#
if [ ! -z $IMAGE ] ; then
# only download if $IMAGE is older than a week (60*24*7=10080) (+9500 is a bit less than a week)
if test $(find $IMAGE -mmin +9500) || ! test -f $IMAGE ; then
if test $(find $IMAGE ! -mmin +9500) || ! test -f $IMAGE ; then
curl $URL > $IMAGE
fi
sudo mkdir -p $IMAGE_MNT
......@@ -140,7 +148,7 @@ else
# else netboot gtk
#
# only download if $KERNEL is older than a week...
if test $(find $KERNEL -mmin +9500) || ! test -f $KERNEL ; then
if test $(find $KERNEL ! -mmin +9500) || ! test -f $KERNEL ; then
curl $URL/$KERNEL > $KERNEL
curl $URL/$INITRD > $INITRD
fi
......
......@@ -32,7 +32,7 @@ fi
STATEFILE=$MUNIN_PLUGSTATE/$(basename $0)
# delete statefile if it's older than $update_interval set in /etc/munin/plugin-conf.d/jenkins
if test $(find $STATEFILE -mmin +$update_interval) ; then
if test $(find $STATEFILE ! -mmin +$update_interval) ; then
rm -f $STATEFILE
fi
......
......@@ -32,7 +32,7 @@ fi
STATEFILE=$MUNIN_PLUGSTATE/$(basename $0)
# delete statefile if it's older than $update_interval set in /etc/munin/plugin-conf.d/jenkins
if test $(find $STATEFILE -mmin +$update_interval) ; then
if test $(find $STATEFILE ! -mmin +$update_interval) ; then
rm -f $STATEFILE
fi
......
......@@ -376,3 +376,16 @@ d-i debian-installer/exit/poweroff boolean true
# packages and run commands in the target system.
#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh
#
# edu specific settings
#
# Tell LTSP to not use the CDROM, but a HTTP mirror
d-i ltsp-client-builder/use_cdrom boolean false
d-i ltsp-client-builder/build-client-opts string --mirror http://ftp.skolelinux.org/debian --dist squeeze
portmap portmap/loopback boolean false
nslcd nslcd/ldap-base string dc=skole,dc=skolelinux,dc=no
nslcd nslcd/ldap-uris string DNS
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment