diff options
| -rwxr-xr-x | bin/reproducible_common.sh | 4 | ||||
| -rwxr-xr-x | bin/reproducible_html_dashboard.sh | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index a63be612..a09bc867 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -574,8 +574,8 @@ create_png_from_table() { sqlite3 -init ${INIT} -csv ${PACKAGES_DB} "SELECT datum, $SUM_DONE, $SUM_OPEN from ${TABLE[3]} ORDER BY datum" >> ${TABLE[$1]}.csv elif [ $1 -eq 8 ] ; then sqlite3 -init ${INIT} --nullvalue 0 -csv ${PACKAGES_DB} "SELECT s.datum, - (SELECT (e.unreproducible+e.ftbfs) FROM ${TABLE[0]} AS e WHERE s.datum=e.datum AND e.suite='unstable' AND e.architecture='$ARCH') AS unfixed_unstable, - COALESCE((SELECT (e.unreproducible+e.ftbfs) FROM ${TABLE[0]} AS e WHERE s.datum=e.datum AND e.suite='testing' AND e.architecture='$ARCH'),0) AS unfixed_testing + (SELECT e.ftbfs FROM ${TABLE[0]} AS e WHERE s.datum=e.datum AND e.suite='$SUITE' AND e.architecture='$ARCH') AS unfixed_ftbfs, + COALESCE((SELECT e.unreproducible FROM ${TABLE[0]} AS e WHERE s.datum=e.datum AND e.suite='$SUITE' AND e.architecture='$ARCH'),0) AS unfixed_ftbr FROM ${TABLE[0]} AS s $WHERE2_EXTRA GROUP BY s.datum" >> ${TABLE[$1]}.csv else sqlite3 -init ${INIT} -csv ${PACKAGES_DB} "SELECT ${FIELDS[$1]} from ${TABLE[$1]} ${WHERE_EXTRA} ORDER BY datum" >> ${TABLE[$1]}.csv diff --git a/bin/reproducible_html_dashboard.sh b/bin/reproducible_html_dashboard.sh index c8bed4ef..1a7a6caa 100755 --- a/bin/reproducible_html_dashboard.sh +++ b/bin/reproducible_html_dashboard.sh @@ -43,7 +43,7 @@ for TAG in $USERTAGS ; do done SUM_DONE="$SUM_DONE)" SUM_OPEN="$SUM_OPEN)" -FIELDS[8]="datum, unfixed_unstable, unfixed_testing" +FIELDS[8]="datum, unfixed_ftbfs, unfixed_ftbr" COLOR[0]=5 COLOR[1]=12 COLOR[2]=1 @@ -65,7 +65,7 @@ YLABEL[3]="Amount of bugs" YLABEL[4]="Amount of packages" YLABEL[5]="Amount of issues" YLABEL[7]="Amount of bugs open / closed" -YLABEL[8]="Amount (unreproducible+ftbfs)" +YLABEL[8]="Amount (ftbfs+unreproducible)" # # update package + build stats @@ -104,8 +104,8 @@ update_suite_arch_stats() { # we do 3 later and 6 is special anyway... for i in 0 1 2 4 5 8 ; do PREFIX="" - if [ $i -eq 0 ] ; then - PREFIX=$SUITE + if [ $i -eq 0 ] || [ $i -eq 2 ] || [ $i -eq 8 ] ; then + PREFIX=$SUITE/$ARCH fi # force regeneration of the image if it exists if [ -f $BASE/$PREFIX/${TABLE[$i]}.png ] ; then @@ -346,7 +346,7 @@ create_suite_arch_stats_page() { write_page "$COUNT_BLACKLISTED blacklisted packages neither.</p>" write_page "<p>" write_page " <a href=\"/$SUITE/$ARCH/${TABLE[0]}.png\"><img src=\"/$SUITE/$ARCH/${TABLE[0]}.png\" alt=\"${MAINLABEL[0]}\"></a>" - for i in 0 2 ; do + for i in 0 2 8 ; do # recreate png once a day if [ ! -f $BASE/$SUITE/$ARCH/${TABLE[$i]}.png ] || [ ! -z $(find $BASE/$SUITE/$ARCH -maxdepth 1 -mtime +0 -name ${TABLE[$i]}.png) ] ; then create_png_from_table $i $SUITE/$ARCH/${TABLE[$i]}.png @@ -439,10 +439,6 @@ create_main_stats_page() { fi done ARCH="amd64" - if [ ! -f $BASE/${TABLE[8]}_$ARCH.png ] || [ ! -z $(find $BASE -maxdepth 1 -mtime +0 -name ${TABLE[8]}_$ARCH.png) ] ; then - # FIXME: this graph needs to be linked from somewhere… - create_png_from_table 8 ${TABLE[8]}_$ARCH.png - fi # write suite builds age graphs write_page "</p><p style=\"clear:both;\">" for SUITE in $SUITES ; do |