diff options
| author | Holger Levsen <holger@layer-acht.org> | 2016-11-21 15:12:31 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-11-21 15:12:31 +0100 |
| commit | 064c711105a16fdf3982ada59b425132123dff80 (patch) | |
| tree | a4df3afc01f2c2a992f59a8e50cfc83554d8fc98 | |
| parent | 2706662221524b890532bd7c8eeadac67f72faa8 (diff) | |
| download | jenkins.debian.net-064c711105a16fdf3982ada59b425132123dff80.tar.xz | |
improve detection of problems
Signed-off-by: Holger Levsen <holger@layer-acht.org>
| -rwxr-xr-x | deploy_everywhere | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/deploy_everywhere b/deploy_everywhere index 8d790ad8..5cfa0445 100755 --- a/deploy_everywhere +++ b/deploy_everywhere @@ -177,14 +177,14 @@ PROBLEMS="" for i in $HOSTS ; do HNAME1=$(echo $i | cut -d "@" -f2 | cut -d "." -f1|cut -d "-" -f1) # pb nodes (h01ger) HNAME2=$(echo $i | cut -d "@" -f2 | cut -d "." -f1) # non -armhf ones (vagrant) - TAIL=$(tail -1 $LOG.$i) + TAIL=$(tail -1 $LOG.$i 2>/dev/null) if [ "$i" = "root@jenkins.debian.net" ] ; then if ! ( [[ "$TAIL" =~ "__$HNAME1=ok__" ]] || [[ "$TAIL" =~ "__$HNAME2=ok__" ]] || [[ "$TAIL" =~ "__reallyreally=ok__" ]] || [[ "$TAIL" =~ "0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." ]] ) ; then echo "Problems on $i:" fi cat $LOG.$i rm $LOG.$i $LOG.$i.done > /dev/null - elif [[ "$TAIL" =~ "__$HNAME1=ok__" ]] || [[ "$TAIL" =~ "__$HNAME2=ok__" ]] || [[ "$TAIL" =~ "__reallyreally=ok__" ]] || [[ "$TAIL" =~ "0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." ]] ; then + elif [[ "$TAIL" =~ "__$HNAME1=ok__" ]] || [[ "$TAIL" =~ "__$HNAME2=ok__" ]] || [[ "$TAIL" =~ "__reallyreally=ok__" ]] || [[ "$TAIL" =~ "0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." ]] || [ ! -f $LOG.$i ] ; then rm $LOG.$i $LOG.$i.done > /dev/null else echo "Problems on $i: $TAIL" |