reproducible: stop treating creating .buildinfo files specially (as every build creates it nowadays)

7 files changed, 16 insertions, 99 deletions

diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py
index 887a2720..519ac56d 100755
--- a/bin/reproducible_common.py
+++ b/bin/reproducible_common.py
@@ -120,13 +120,8 @@ html_head_page = Template((tab*2).join("""
       </a>
     </li>
     <li>
-      <a href="/index_FTBR_with_buildinfo.html" target="_parent">
-        <img src="/userContent/static/weather-showers-scattered.png" alt="FTBR_with_buildinfo icon" />
-      </a>
-    </li>
-    <li>
       <a href="/index_FTBR.html" target="_parent">
-        <img src="/userContent/static/weather-showers.png" alt="FTBR icon" />
+        <img src="/userContent/static/weather-showers-scattered.png" alt="FTBR icon" />
       </a>
     </li>
     <li>
@@ -167,18 +162,12 @@ html_foot_page_style_note = Template((tab*2).join("""
   package has a note. Visited packages are linked in green, those which
   have not been visited are linked in blue.
 """.splitlines(True)))
-html_foot_page_buildinfo_note = Template((tab*2).join("""  <br />
-  A &beta; sign after a package which is unreproducible indicates that a
-  .buildinfo file was generated. And that means the
-  <a href="https://wiki.debian.org/ReproducibleBuilds#The_basics_for_making_packages_build_reproducible">
-  basics for building packages reproducibly are covered</a>.
-</p>""".splitlines(True)))
 
 
 url2html = re.compile(r'((mailto\:|((ht|f)tps?)\://|file\:///){1}\S+)')
 
 
-def write_html_page(title, body, destfile, noheader=False, style_note=False, buildinfo_note=False, noendpage=False):
+def write_html_page(title, body, destfile, noheader=False, style_note=False, noendpage=False):
     now = datetime.datetime.utcnow().strftime('%Y-%m-%d %H:%M UTC')
     html = ''
     html += html_header.substitute(page_title=title)
@@ -193,10 +182,7 @@ def write_html_page(title, body, destfile, noheader=False, style_note=False, bui
     html += body
     if style_note:
         html += html_foot_page_style_note.substitute()
-    if buildinfo_note:
-        html += html_foot_page_buildinfo_note.substitute()
-    else:
-        html += (tab*2) + '</p>'
+    html += (tab*2) + '</p>'
     if not noendpage:
         html += html_footer.substitute(date=now)
     else:
@@ -216,8 +202,7 @@ def query_db(query):
 def join_status_icon(status, package=None, version=None):
     table = {'reproducible' : 'weather-clear.png',
              'FTBFS': 'weather-storm.png',
-             'FTBR' : 'weather-showers.png',
-             'FTBR_with_buildinfo': 'weather-showers-scattered.png',
+             'FTBR' : 'weather-showers-scattered.png',
              '404': 'weather-severe-alert.png',
              'not for us': 'weather-few-clouds-night.png',
              'not_for_us': 'weather-few-clouds-night.png',
@@ -227,8 +212,6 @@ def join_status_icon(status, package=None, version=None):
             log.error('Could not determinate the real state of package None. '
                       + 'Returning a generic "FTBR"')
             status = 'FTBR'
-        elif pkg_has_buildinfo(package, version):
-            status = 'FTBR_with_buildinfo'
         else:
             status = 'FTBR'
     log.debug('Linking status ⇔ icon. package: ' + str(package) + ' @ ' +
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 14384c3e..badc53c9 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -158,11 +158,10 @@ META_PKGSET[13]="maint_pkg-perl-maintainers"
 init_html() {
 	SUITE=sid
 	MAINVIEW="stats"
-	ALLSTATES="reproducible FTBR_with_buildinfo FTBR FTBFS 404 not_for_us blacklisted"
+	ALLSTATES="reproducible FTBR FTBFS 404 not_for_us blacklisted"
 	ALLVIEWS="issues notes scheduled last_24h last_48h all_abc dd-list stats pkg_sets"
 	SPOKENTARGET["reproducible"]="packages which built reproducibly"
-	SPOKENTARGET["FTBR"]="packages which failed to build reproducibly and do not create a .buildinfo file"
-	SPOKENTARGET["FTBR_with_buildinfo"]="packages which failed to build reproducibly and create a .buildinfo file"
+	SPOKENTARGET["FTBR"]="packages which failed to build reproducibly"
 	SPOKENTARGET["FTBFS"]="packages which failed to build from source"
 	SPOKENTARGET["404"]="packages where the sources failed to download"
 	SPOKENTARGET["not_for_us"]="packages which should not be build on 'amd64'"
@@ -182,7 +181,6 @@ init_html() {
 	COUNT_GOOD=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT COUNT(name) FROM source_packages WHERE status = \"reproducible\"")
 	PERCENT_TOTAL=$(echo "scale=1 ; ($COUNT_TOTAL*100/$AMOUNT)" | bc)
 	PERCENT_GOOD=$(echo "scale=1 ; ($COUNT_GOOD*100/$COUNT_TOTAL)" | bc)
-	BUILDINFO_SIGNS=true
 }
 
 write_page() {
@@ -196,13 +194,7 @@ set_icon() {
 	case "$1" in
 		reproducible)		ICON=weather-clear.png
 					;;
-		unreproducible|FTBR*)	if [ "$2" != "" ] ; then
-						ICON=weather-showers-scattered.png
-						STATE_TARGET_NAME=FTBR_with_buildinfo
-					else
-						ICON=weather-showers.png
-						STATE_TARGET_NAME=FTBR
-					fi
+		unreproducible|FTBR)	ICON=weather-showers-scattered.png
 					;;
 		FTBFS)			ICON=weather-storm.png
 					;;
@@ -224,7 +216,6 @@ write_icon() {
 
 write_page_header() {
 	rm -f $PAGE
-	BUILDINFO_ON_PAGE=false
 	write_page "<!DOCTYPE html><html><head>"
 	write_page "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />"
 	write_page "<link href=\"/userContent/static/style.css\" type=\"text/css\" rel=\"stylesheet\" />"
@@ -240,11 +231,7 @@ write_page_header() {
 	write_page "</p>"
 	write_page "<ul><li>Have a look at:</li>"
 	for MY_STATE in $ALLSTATES ; do
-		WITH=""
-		if [ "$MY_STATE" = "FTBR_with_buildinfo" ] ; then
-			WITH="YES"
-		fi
-		set_icon $MY_STATE $WITH
+		set_icon $MY_STATE
 		write_page "<li>"
 		write_icon
 		write_page "</li>"
@@ -271,12 +258,7 @@ write_page_footer() {
 }
 
 write_page_meta_sign() {
-	write_page "<p style=\"font-size:0.9em;\">A package name displayed with a bold font is an indication that this package has a note. Visited packages are linked in green, those which have not been visited are linked in blue."
-	if $BUILDINFO_ON_PAGE ; then
-		write_page "A &beta; sign after a package which is unreproducible indicates that a .buildinfo file was generated."
-		write_page "And that means the <a href=\"https://wiki.debian.org/ReproducibleBuilds#The_basics_for_making_packages_build_reproducible\">basics for building packages reproducibly are covered</a>."
-	fi
-	write_page "</p>"
+	write_page "<p style=\"font-size:0.9em;\">A package name displayed with a bold font is an indication that this package has a note. Visited packages are linked in green, those which have not been visited are linked in blue.</p>"
 }
 
 publish_page() {
@@ -288,14 +270,6 @@ publish_page() {
 	echo "Enjoy $REPRODUCIBLE_URL/$PAGE"
 }
 
-set_package_star() {
-	if [ -f "/var/lib/jenkins/userContent/buildinfo/${PKG}_*.buildinfo" ] ; then
-		STAR="<span class=\"beta\">&beta;</span>" # used to be a star...
-	else
-		STAR=""
-	fi
-}
-
 set_package_class() {
 	if [ -f ${NOTES_PATH}/${PKG}_note.html ] ; then
 		CLASS="class=\"noted\""
@@ -316,16 +290,8 @@ force_package_targets() {
 }
 
 link_packages() {
-	STAR=""
 	for PKG in $@ ; do
-		if $BUILDINFO_SIGNS ; then
-			set_package_star
-			if ! $BUILDINFO_ON_PAGE && [ ! -z "$STAR" ] ; then
-				BUILDINFO_ON_PAGE=true
-			fi
-
-		fi
-		write_page " ${LINKTARGET[$PKG]}$STAR"
+		write_page " ${LINKTARGET[$PKG]}"
 	done
 }
 
@@ -379,7 +345,6 @@ gather_stats() {
 
 update_html_schedule() {
 	VIEW=scheduled
-	BUILDINFO_SIGNS=true
 	PAGE=index_${VIEW}.html
 	echo "$(date) - starting to write $PAGE page."
 	write_page_header $VIEW "Overview of ${SPOKENTARGET[$VIEW]}"
diff --git a/bin/reproducible_html_graphs.sh b/bin/reproducible_html_graphs.sh
index a339368d..b946d98e 100755
--- a/bin/reproducible_html_graphs.sh
+++ b/bin/reproducible_html_graphs.sh
@@ -272,7 +272,6 @@ done
 write_page "</ul>"
 for i in $(seq 1 ${#META_PKGSET[@]}) ; do
 	write_page "<hr /><a name=\"${META_PKGSET[$i]}\"></a>"
-	BUILDINFO_SIGNS=true
 	META_RESULT=true
 	gather_meta_stats $i	# FIXME: this ignores unknown packages...
 	if $META_RESULT ; then
diff --git a/bin/reproducible_html_indexes.sh b/bin/reproducible_html_indexes.sh
index 371e206a..d65a3dd3 100755
--- a/bin/reproducible_html_indexes.sh
+++ b/bin/reproducible_html_indexes.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2014 Holger Levsen <holger@layer-acht.org>
+# Copyright 2014-2015 Holger Levsen <holger@layer-acht.org>
 # released under the GPLv=2
 
 DEBUG=false
@@ -47,7 +47,6 @@ force_package_targets ${BAD["all"]}
 force_package_targets ${UGLY["all"]} ${GOOD["all"]} ${SOURCELESS["all"]} ${NOTFORUS["all"]} $BLACKLISTED
 
 for VIEW in last_24h last_48h all_abc ; do
-	BUILDINFO_SIGNS=true
 	PAGE=index_${VIEW}.html
 	echo "$(date) - starting to write $PAGE page."
 	write_page_header $VIEW "Overview of reproducible builds of ${SPOKENTARGET[$VIEW]}"
@@ -100,7 +99,6 @@ for VIEW in last_24h last_48h all_abc ; do
 	set_icon reproducible
 	write_icon
 	write_page "$COUNT_GOOD packages ($PERCENT_GOOD%) successfully built reproducibly$FINISH <code>"
-	BUILDINFO_SIGNS=false
 	link_packages ${GOOD[$VIEW]}
 	write_page "</code></p>"
 	write_page_meta_sign
@@ -114,7 +112,6 @@ count_packages() {
 }
 
 for STATE in $ALLSTATES ; do
-	BUILDINFO_SIGNS=false
 	PAGE=index_${STATE}.html
 	echo "$(date) - starting to write $PAGE page."
 	write_page_header $STATE "Overview of ${SPOKENTARGET[$STATE]}"
@@ -122,26 +119,7 @@ for STATE in $ALLSTATES ; do
 	case "$STATE" in
 		reproducible)	PACKAGES=${GOOD["all"]}
 				;;
-		FTBR)		CANDIDATES=${BAD["all"]}
-				PACKAGES=""
-				for PKG in $CANDIDATES ; do
-					set_package_star
-					if [ "$STAR" = "" ] ; then
-						PACKAGES="$PACKAGES $PKG"
-					fi
-				done
-				;;
-		FTBR_with_buildinfo)
-				BUILDINFO_SIGNS=true
-				CANDIDATES=${BAD["all"]}
-				PACKAGES=""
-				for PKG in $CANDIDATES ; do
-					set_package_star
-					if [ "$STAR" != "" ] ; then
-						PACKAGES="$PACKAGES $PKG"
-					fi
-				done
-				WITH="YES"
+		FTBR)		PACKAGES=${BAD["all"]}
 				;;
 		FTBFS)		PACKAGES=${UGLY["all"]}
 				;;
diff --git a/bin/reproducible_html_notes.py b/bin/reproducible_html_notes.py
index 64a9a00e..e4dd52e9 100755
--- a/bin/reproducible_html_notes.py
+++ b/bin/reproducible_html_notes.py
@@ -313,10 +313,7 @@ def index_notes(notes):
     html = (tab*2).join(html.splitlines(True))
     for pkg in sorted(notes):
         url = RB_PKG_URI + '/' + pkg + '.html'
-        html += tab*4 + '<a href="' + url + '" class="noted">' + pkg + '</a>'
-        if pkg_has_buildinfo(pkg):
-            html += '<span class="beta">&beta;</span>'
-        html += '\n'
+        html += tab*4 + '<a href="' + url + '" class="noted">' + pkg + '</a>\n'
     html += tab*3 + '</code>\n'
     html += tab*2 + '</p>\n'
     html += tab*2 + '<p>Notes are stored in <a href="https://anonscm.debian.org/cgit/reproducible/notes.git">notes.git</a>.</p>'
@@ -324,7 +321,7 @@ def index_notes(notes):
     destfile = BASE + '/index_notes.html'
     desturl = REPRODUCIBLE_URL + '/index_notes.html'
     write_html_page(title=title, body=html, destfile=destfile,
-                    style_note=True, buildinfo_note=True)
+                    style_note=True)
     log.info('Notes index now available at ' + desturl)
 
 
diff --git a/bin/reproducible_json.sh b/bin/reproducible_json.sh
index aea32913..9c877e45 100755
--- a/bin/reproducible_json.sh
+++ b/bin/reproducible_json.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2014 Holger Levsen <holger@layer-acht.org>
+# Copyright 2014-2015 Holger Levsen <holger@layer-acht.org>
 # released under the GPLv=2
 
 DEBUG=false
@@ -27,11 +27,6 @@ while read LINE ; do
 	PKG=$(echo "$LINE" | cut -d "|" -f1)
 	VERSION=$(echo "$LINE" | cut -d "|" -f2)
 	STATUS=$(echo "$LINE" | cut -d "|" -f3)
-	if [ "$STATUS" = "unreproducible" ] ; then
-	        if [ -f /var/lib/jenkins/userContent/buildinfo/${PKG}_${VERSION}_amd64.buildinfo ] ; then
-			STATUS="$STATUS-with-buildinfo"
-		fi
-	fi
 	write_json "${sep}{"
 	write_json "\"package\": \"$PKG\","
 	write_json "\"version\": \"$VERSION\","
diff --git a/bin/reproducible_scheduler.sh b/bin/reproducible_scheduler.sh
index 1dd79679..af7eb5e1 100755
--- a/bin/reproducible_scheduler.sh
+++ b/bin/reproducible_scheduler.sh
@@ -207,7 +207,7 @@ let "TOTAL=$TOTAL+$AMOUNT"
 ALL_PACKAGES="$ALL_PACKAGES $PACKAGES"
 
 echo "So in total now $TOTAL packages about to be scheduled."
-MESSAGE="$MESSAGE and $AMOUNT packages with the same version (but without .buildinfo files) again, for a total of $TOTAL scheduled packages."
+MESSAGE="$MESSAGE and $AMOUNT packages with the same version again, for a total of $TOTAL scheduled packages."
 
 # finally
 schedule_packages