diff options
| author | Holger Levsen <holger@layer-acht.org> | 2012-12-02 19:34:42 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2012-12-02 19:34:42 +0100 |
| commit | 997b2cbabb1978aa3762ae1557fe29c3780da72f (patch) | |
| tree | 6b465b72c134c9a3fc19b00279b0d0743258efc0 /bin | |
| parent | 1e221a2be5d85579166365828a1368d569d23d90 (diff) | |
| download | jenkins.debian.net-997b2cbabb1978aa3762ae1557fe29c3780da72f.tar.xz | |
make cd-tests more robust
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/cd_tester.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/bin/cd_tester.sh b/bin/cd_tester.sh index af473d1e..f57189e6 100755 --- a/bin/cd_tester.sh +++ b/bin/cd_tester.sh @@ -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 |