[Qa-jenkins-scm] [jenkins.debian.net] 02/02: reproducible Debian: merge all done and all open usertagged bugs together in graph

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit f794313de062993754e7274ccd5061ab0109bb3b
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Nov 30 17:55:45 2016 +0100

    reproducible Debian: merge all done and all open usertagged bugs together in graph
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_html_dashboard.sh | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/bin/reproducible_html_dashboard.sh b/bin/reproducible_html_dashboard.sh
index 7207524..55d8c16 100755
--- a/bin/reproducible_html_dashboard.sh
+++ b/bin/reproducible_html_dashboard.sh
@@ -31,16 +31,18 @@ for i in reproducible unreproducible FTBFS other ; do
 done
 FIELDS[2]="datum, oldest"
 FIELDS[3]="datum "
-for TAG in $USERTAGS ; do
-	# for this table (#3) bugs with ftbfs tags are ignored _now_…
-	if [ "$TAG" = "ftbfs" ] ; then
-		continue
-	fi
-	FIELDS[3]="${FIELDS[3]}, open_$TAG, done_$TAG"
+for STATE in open_ done_ ; do
+	for TAG in $USERTAGS ; do
+		# for this table (#3) bugs with ftbfs tags are ignored _now_…
+		if [ "$TAG" = "ftbfs" ] ; then
+			continue
+		fi
+		FIELDS[3]="${FIELDS[3]}, ${STATE}$TAG"
+	done
+	# …and added at the end (so they are not ignored but rather sorted this way)
+	# Also note that FIELDS is only used for reading data, not writing.
+	FIELDS[3]="${FIELDS[3]}, ${STATE}ftbfs"
 done
-# …and added at the end (so they are not ignored but rather sorted this way)
-# Also note how FIELDS is only used for reading data, not writing.
-FIELDS[3]="${FIELDS[3]}, open_ftbfs, done_ftbfs"
 FIELDS[4]="datum, packages_with_notes"
 FIELDS[5]="datum, known_issues"
 FIELDS[7]="datum, done_bugs, open_bugs"
@@ -53,12 +55,14 @@ done
 SUM_DONE="$SUM_DONE)"
 SUM_OPEN="$SUM_OPEN)"
 FIELDS[8]="datum "
-for TAG in $USERTAGS ; do
-	# for this table (#8) bugs with ftbfs tags are ignored.
-	if [ "$TAG" = "ftbfs" ] ; then
-		continue
-	fi
-	FIELDS[8]="${FIELDS[8]}, open_$TAG, done_$TAG"
+for STATE in open_ done_ ; do
+	for TAG in $USERTAGS ; do
+		if [ "$TAG" = "ftbfs" ] ; then
+			continue
+		fi
+		FIELDS[8]="${FIELDS[8]}, ${STATE}$TAG"
+	done
+	FIELDS[8]="${FIELDS[8]}, ${STATE}ftbfs"
 done
 FIELDS[9]="datum, done_bugs, open_bugs"
 REPRODUCIBLE_DONE="(0"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git