From 1a29cdf01f84c4bcc223de68541e5ae6e777bce7 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 9 Oct 2015 15:46:15 +0200
Subject: reproducible: drop redundant 'stats_pkgs_to_fix' graphs

---
 bin/reproducible_common.sh         | 20 ++++----------------
 bin/reproducible_html_dashboard.sh | 16 ++++------------
 2 files changed, 8 insertions(+), 28 deletions(-)

(limited to 'bin')

diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index a7b25e57..7bed37fc 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -78,7 +78,6 @@ TABLE[4]=stats_notes
 TABLE[5]=stats_issues
 TABLE[6]=stats_meta_pkg_state
 TABLE[7]=stats_bugs_state
-TABLE[8]=stats_pkgs_to_fix
 
 # known package sets
 META_PKGSET[1]="essential"
@@ -549,6 +548,10 @@ create_png_from_table() {
 			# armhf was only build since 2015-08-30
 			WHERE_EXTRA="$WHERE_EXTRA AND datum >= '2015-08-30'"
 		fi
+		# testing/amd64 was only build since...
+		# WHERE2_EXTRA="WHERE s.datum >= '2015-03-08'"
+		# experimental/amd64 was only build since...
+		# WHERE2_EXTRA="WHERE s.datum >= '2015-02-28'"
 	fi
 	# run query
 	if [ $1 -eq 1 ] ; then
@@ -573,18 +576,6 @@ create_png_from_table() {
 		sqlite3 -init ${INIT} -csv ${PACKAGES_DB} "SELECT datum, oldest_reproducible FROM ${TABLE[$1]} ${WHERE_EXTRA} ORDER BY datum" >> ${TABLE[$1]}.csv
 	elif [ $1 -eq 7 ] ; then
 		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
-		if [ "$ARCH" = "amd64" ] && [ "$SUITE" = "testing" ] ; then
-			# testing/amd64 was only build since...
-			WHERE2_EXTRA="WHERE s.datum >= '2015-03-08'"
-		elif [ "$ARCH" = "amd64" ] && [ "$SUITE" = "experimental" ] ; then
-			# experimental/amd64 was only build since...
-			WHERE2_EXTRA="WHERE s.datum >= '2015-02-28'"
-		fi
-		sqlite3 -init ${INIT} --nullvalue 0 -csv ${PACKAGES_DB} "SELECT s.datum,
-			(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
 	fi
@@ -600,9 +591,6 @@ create_png_from_table() {
 	fi
 	local WIDTH=1920
 	local HEIGHT=960
-	if [ $1 -eq 8 ] ; then
-		HEIGHT=480
-	fi
 	# only generate graph if the query returned data
 	if [ $(cat ${TABLE[$1]}.csv | wc -l) -gt 1 ] ; then
 		echo "Updating $2..."
diff --git a/bin/reproducible_html_dashboard.sh b/bin/reproducible_html_dashboard.sh
index 260d858e..6eefd48b 100755
--- a/bin/reproducible_html_dashboard.sh
+++ b/bin/reproducible_html_dashboard.sh
@@ -43,7 +43,6 @@ for TAG in $USERTAGS ; do
 done
 SUM_DONE="$SUM_DONE)"
 SUM_OPEN="$SUM_OPEN)"
-FIELDS[8]="datum, unfixed_ftbfs, unfixed_ftbr"
 COLOR[0]=5
 COLOR[1]=12
 COLOR[2]=1
@@ -51,13 +50,11 @@ COLOR[3]=32
 COLOR[4]=1
 COLOR[5]=1
 COLOR[7]=2
-COLOR[8]=2
 MAINLABEL[1]="Amount of packages built each day"
 MAINLABEL[3]="Usertags on bugs for user reproducible-builds@lists.alioth.debian.org"
 MAINLABEL[4]="Packages which have notes"
 MAINLABEL[5]="Identified issues"
 MAINLABEL[7]="Open and closed bugs"
-MAINLABEL[8]="Packages which need to be fixed"
 YLABEL[0]="Amount (total)"
 YLABEL[1]="Amount (per day)"
 YLABEL[2]="Age in days"
@@ -65,7 +62,6 @@ 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 (ftbfs+unreproducible)"
 
 #
 # update package + build stats
@@ -102,9 +98,9 @@ update_suite_arch_stats() {
 		sqlite3 -init ${INIT} ${PACKAGES_DB} "INSERT INTO ${TABLE[1]} VALUES (\"$DATE\", \"$SUITE\", \"$ARCH\", $GOOAY, $BAAY, $UGLDAY, $RESDAY)"
 		sqlite3 -init ${INIT} ${PACKAGES_DB} "INSERT INTO ${TABLE[2]} VALUES (\"$DATE\", \"$SUITE\", \"$ARCH\", \"$DIFFG\", \"$DIFFB\", \"$DIFFU\")"
 		# we do 3 later and 6 is special anyway...
-		for i in 0 1 2 4 5 8 ; do
+		for i in 0 1 2 4 5 ; do
 			PREFIX=""
-			if [ $i -eq 0 ] || [ $i -eq 2 ] || [ $i -eq 8 ] ; then
+			if [ $i -eq 0 ] || [ $i -eq 2 ] ; then
 				PREFIX=$SUITE/$ARCH
 			fi
 			# force regeneration of the image if it exists
@@ -346,7 +342,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 8 ; do
+	for i in 0 2 ; 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
@@ -371,11 +367,7 @@ create_dashboard_page() {
 		write_page " <a href=\"/$SUITE\"><img src=\"/$SUITE/$ARCH/${TABLE[0]}.png\" class=\"overview\" alt=\"$SUITE/$ARCH stats\"></a>"
 	done
 	write_page "</p><p style=\"clear:both;\">"
-	# packages to be fixed in unstable+testing/amd64
-	for SUITE in testing unstable ; do
-		write_page " <a href=\"/$SUITE/amd64/${TABLE[8]}.png\"><img src=\"/$SUITE/amd64/${TABLE[8]}.png\" class="overview" alt=\"${MAINLABEL[8]}\"></a>"
-	done
-	write_page "</p><p><center>"
+	write_page "<center>"
 	# write meta pkg graphs per suite
 	for SUITE in $SUITES ; do
 		if [ "$SUITE" != "unstable" ] ; then
-- 
cgit v1.2.3-54-g00ecf