diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-11-27 01:01:50 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-11-27 01:01:50 +0100 |
| commit | a4baa0d6eb582bcb82ef60a6185c87cd86a20067 (patch) | |
| tree | 21e1e6d66b6dc24a9af361a016abc0bbf541581e | |
| parent | 9151984d9ac8135bc0a5e2f57f1654520443ba1b (diff) | |
| parent | c3433e511217147a41788cb20d6448c4be99aceb (diff) | |
| download | jenkins.debian.net-a4baa0d6eb582bcb82ef60a6185c87cd86a20067.tar.xz | |
Merge branch 'master' of git://git.debian.org/git/qa/jenkins.debian.net
| -rw-r--r-- | bin/g-i-installation.sh | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 375a4bf0..320d5a9b 100644 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -1113,6 +1113,24 @@ monitor_system() { if [[ "$PIXEL" =~ ^[0-9]+$ ]] ; then echo "$PIXEL pixel difference between snapshot_${PRINTF_NR}.png and snapshot_${PRINTF_OLD}.png" if [ $PIXEL -lt 400 ] ; then + SAME=Y + for INTER in $(seq $OLD 10 $NR); do + PRINTF_INTER=$(printf "%06d" $INTER) + PIXEL=$(compare -metric AE snapshot_${PRINTF_NR}.png snapshot_${PRINTF_INTER}.png /dev/null 2>&1 || true ) + if [[ "$PIXEL" =~ ^[0-9]+$ ]] ; then + if [ $PIXEL -ge 400 ] ; then + echo "but $PIXEL difference between snapshot_${PRINTF_NR}.png and snapshot_${PRINTF_INTER}.png" + SAME=N + break + fi + else + echo "but snapshot_${PRINTF_NR}.png and snapshot_${PRINTF_INTER}.png have different sizes." + SAME=N + break + fi + done + if [ $SAME = Y ] + then # unless TRIGGER_MODE is empty, matching images means its over if [ ! -z "$TRIGGER_MODE" ] ; then echo "Warning: snapshot_${PRINTF_NR}.png snapshot_${PRINTF_OLD}.png match or almost match, ending installation." @@ -1130,6 +1148,7 @@ monitor_system() { # really kick off trigger: let TRIGGER_NR=NR fi + fi fi else echo "snapshot_${PRINTF_NR}.png and snapshot_${PRINTF_OLD}.png have different sizes." |