X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=buildd%2Ffunctions.sh;h=7adf5c1ed186fcbb086da8798df8b8802356f2ef;hp=c7d9ebcfc157b9a01ba5238fa7c34218e226b0d0;hb=d7655f4299706806e259c2d4953bbfe4183ac004;hpb=08dce3af0da758cda35dc98b2819f4f6efb00c07 diff --git a/buildd/functions.sh b/buildd/functions.sh index c7d9ebc..7adf5c1 100755 --- a/buildd/functions.sh +++ b/buildd/functions.sh @@ -13,30 +13,29 @@ die() { . /etc/grml/grml-buildd.conf || die "Could not source /etc/grml/grml-buildd.conf. Exiting." -type -p mutt 1>/dev/null 2>&1 || die "mutt binary not found. Exiting." +which mutt >/dev/null 2>&1 || die "mutt binary not found. Exiting." # exit if important variables aren't set: [ -n "$STORAGE" ] || die "\$STORAGE is not set. Exiting." [ -n "$SUITE" ] || die "\$SUITE is not set. Exiting." [ -n "$CLASSES" ] || die "\$CLASSES is not set. Exiting." [ -n "$NAME" ] || die "\$NAME is not set. Exiting." -[ -n "$ISO_NAME" ] || die "\$ISO_NAME is not set. Exiting." +[ -n "$PRODUCT_NAME" ] || die "\$PRODUCT_NAME is not set. Exiting." # some defaults: PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11 -DATE="$(date +%Y%m%d)" +DATE=$(date +'%Y%m%d_%H%M%S') TMP_DIR="$(mktemp -d)" -MUTT_HEADERS="$(mktemp)" [ -n "$TMP_DIR" ] || die "Could not create \$TMP_DIR. Exiting." -[ -n "$MUTT_HEADERS" ] || die "Could not create $\MUTT_HEADERS. Exiting." -[ -n "$ARCH" ] && GRML_LIVE_ARCH="-a $ARCH" +ISO_NAME="${PRODUCT_NAME}.iso" # make sure we have same safe defaults: [ -n "$OUTPUT_DIR" ] || OUTPUT_DIR="${STORAGE}/grml-live_${DATE}.$$" [ -n "$ISO_DIR" ] || ISO_DIR=$STORAGE/grml-isos [ -n "$RECIPIENT" ] || RECIPIENT=root@localhost -[ -n "$ATTACHMENT" ] || ATTACHMENT="$TMP_DIR/grml-live-logs_$DATE.tar.gz" [ -n "$FROM" ] || FROM=root@localhost +[ -n "$ARCH" ] || ARCH="$(dpkg --print-architecture)" +ATTACHMENT="$TMP_DIR/grml-live-logs_$DATE.tar.gz" if [ -n "$LOGFILE" ] ; then GRML_LOGFILE="$LOGFILE" @@ -46,8 +45,6 @@ fi [ -n "$FAI_LOGFILES" ] || FAI_LOGFILES=/var/log/fai/grml/last -echo "my_hdr From: grml-live autobuild daemon <$FROM>" > $MUTT_HEADERS - # execute grml-live: grml_live_run() { if ! [ "$FORCE_REBUILD" = "1" ] ; then @@ -62,6 +59,7 @@ grml_live_run() { case $SUITE in sid) CODENAME=sid ;; squeeze) CODENAME=squ ;; + wheezy) CODENAME=wheez ;; lenny) CODENAME=lenny ;; etch) CODENAME=etch ;; esac @@ -69,10 +67,12 @@ grml_live_run() { grml_name="$NAME-daily-$CODENAME" shortdate="$(date +%y%m%d)" - grml-live -F $* $GRML_LIVE_ARCH -s $SUITE -c $CLASSES -o $OUTPUT_DIR \ + TIME_START=$(date +%s) + grml-live -F $* -a $ARCH -s $SUITE -c $CLASSES -o $OUTPUT_DIR \ -g "$grml_name" -v "$shortdate" -r grml-live-autobuild -i $ISO_NAME \ - 1>/var/log/grml-buildd.stdout \ - 2>/var/log/grml-buildd.stderr ; RC=$? + >/var/log/grml-buildd.log 2>&1 ; RC=$? + TIME_END=$(date +%s) + WALLTIME=$(($TIME_END-$TIME_START)) if [ "$RC" = "0" ] ; then RC_INFO=success @@ -84,15 +84,14 @@ grml_live_run() { # create log archive: create_logs() { - ( cd / && tar zcf $ATTACHMENT $FAI_LOGFILES /var/log/grml-buildd.stderr /var/log/grml-buildd.stdout $GRML_LOGFILE 1>/dev/null ) + ( cd / && tar zcfh $ATTACHMENT $FAI_LOGFILES /var/log/grml-buildd.log $GRML_LOGFILE >/dev/null ) } # store logs on remote server: upload_logs() { [ -n "$RSYNC_MIRROR" ] || return 1 - umask 002 - rsync --exclude dmesg.log --times --partial --copy-links -az --quiet /var/log/grml-buildd.* \ - $FAI_LOGFILES $GRML_LOGFILE $RSYNC_MIRROR/logs/"${NAME}_${DATE}"/ + rsync --exclude dmesg.log --times --partial --copy-links -rltDz --quiet /var/log/grml-buildd.log \ + $FAI_LOGFILES $GRML_LOGFILE $RSYNC_MIRROR/logs/"${PRODUCT_NAME}_${DATE}"/ } # store information of ISO size: @@ -108,14 +107,16 @@ iso_details() { send_mail() { # create logs if using 'send_mail -e' [ "$1" = "-e" ] && create_logs + # attach logs only if we have some: [ -r "$ATTACHMENT" ] && MUTT_ATTACH="-a $ATTACHMENT" || MUTT_ATTACH='' - echo -en "Automatically generated mail by $SCRIPTNAME + echo "Automatically generated mail by $SCRIPTNAME $ISO_DETAILS -Return code of grml-live run was: $RC +Return code of grml-live was: $RC +Time: $WALLTIME $(grep -A2 'Executed grml-live' $GRML_LOGFILE || echo "* executed grml-live command line not available") @@ -123,11 +124,15 @@ $(grep -A2 'Executed FAI' $GRML_LOGFILE || echo "* executed FAI command line not The following errors have been noticed (several might be warnings only): -$(grep -i error $FAI_LOGFILES/* /var/log/grml-buildd.std* | grep -ve liberror -ve libgpg-error || echo "* nothing") +$(grep -i error $FAI_LOGFILES/*.log /var/log/grml-buildd.log | grep -ve liberror -ve libgpg-error -ve libcomerr -ve 'no errors found' || echo "* nothing") + +The following errors have been noticed in FAI scripts: + +$(grep -B2 "FAILED with exit code" $FAI_LOGFILES/* | echo "* nothing") The following warnings have been noticed: -$(grep -i warn $FAI_LOGFILES/* /var/log/grml-buildd.std* || echo "* nothing") +$(grep -i warn $FAI_LOGFILES/* /var/log/grml-buildd.log || echo "* nothing") There following dependency problems have been noticed: @@ -137,11 +142,11 @@ The following packages could not be installed: $(grep -i "Couldn't find.*package" $FAI_LOGFILES/software.log | sed 's/\(.*\)"\(.*\)"\(.*\)/\2/' | sort -u || echo "* nothing") -See attached files: -/var/log/grml-buildd.stderr /var/log/grml-buildd.stdout $ATTACHMENT +See attached files for further details. -EOF " | \ - mutt -s "$SCRIPTNAME [${DATE}] - $RC_INFO" -a /var/log/grml-buildd.stderr $MUTT_ATTACH "$RECIPIENT" +EOF" | \ + mutt -e "my_hdr From: grml-live autobuild daemon <$FROM>" -s "$SCRIPTNAME [${DATE}] - $RC_INFO" \ + -a /var/log/grml-buildd.log $MUTT_ATTACH -- "$RECIPIENT" } # make sure we store the final iso: @@ -161,9 +166,9 @@ store_iso() { # allow clean exit: bailout() { if [ "$RC" = "0" ] ; then - rm -rf "$TMP_DIR" "$MUTT_HEADERS" "$OUTPUT_DIR" + rm -rf "$ATTACHMENT" "$TMP_DIR" "$OUTPUT_DIR" else - rm -f "$MUTT_HEADERS" + rm -f "$ATTACHMENT" echo "building ISO failed, keeping build files [${OUTPUT_DIR} / ${TMP_DIR}]">&2 fi