From a23cbd52bb7273f45eeff6b68e1e5a9af116fe52 Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo Date: Thu, 19 Jan 2017 11:39:54 +0100 Subject: reproducible debian: html_dashboard: automatically adapt the stats about average builds per day in case of new architectures Signed-off-by: Holger Levsen --- bin/reproducible_html_dashboard.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/bin/reproducible_html_dashboard.sh b/bin/reproducible_html_dashboard.sh index 57fa09c0..c5d19e36 100755 --- a/bin/reproducible_html_dashboard.sh +++ b/bin/reproducible_html_dashboard.sh @@ -342,20 +342,22 @@ write_build_performance_stats() { done write_page "packages tested on average per day in the last $TIMESPAN_VERBOSE" for ARCH in ${ARCHS} ; do - if [ "$ARCH" = "arm64" ] ; then - TIMESPAN_RAW="14" - local ARM64_DISCLAIMER=" (in the last 2 weeks)" - else - TIMESPAN_RAW="28" - local ARM64_DISCLAIMER="" + local OLDEST_BUILD="$(query_db "SELECT build_date FROM stats_build WHERE architecture='$ARCH' ORDER BY build_date ASC LIMIT 1")" + local DAY_DIFFS="$(( ($(date -d "$DATE" +%s) - $(date -d "$OLDEST_BUILD" +%s)) / (60*60*24) ))" + if [ $DAY_DIFFS -lt $TIMESPAN_RAW ]; then + # this is a new architecture, there are fewer days to compare to. + local DISCLAIMER=" (in the last $DAY_DIFFS days)" + TIMESPAN_RAW=$DAY_DIFF fi local TIMESPAN="$(echo $TIMESPAN_RAW-1|bc)" local TIMESPAN_DATE=$(date '+%Y-%m-%d %H:%M' -d "- $TIMESPAN days") RESULT=$(query_db "SELECT COUNT(r.build_date) FROM stats_build AS r WHERE r.build_date > '$TIMESPAN_DATE' AND r.architecture='$ARCH'") RESULT="$(echo $RESULT/$TIMESPAN_RAW|bc)" - write_page "$RESULT$ARM64_DISCLAIMER" + write_page "${RESULT}${DISCLAIMER:-}" done + + local TIMESPAN_VERBOSE="3 months" local TIMESPAN_RAW="91" # Find stats for 91 days since yesterday, no stats exist for today -- cgit v1.2.3-70-g09d2