bin/reproducible.ini

@@ -40,9 +40,9 @@ defaultarch = x86_64
 [archlinux]
 distro_root = archlinux
 landing_page = archlinux.html
-suites = default
+suites = archlinux_core archlinux_community archlinux_extra archlinux_multilib
 archs = x86_64
-defaultsuite = default
+defaultsuite = archlinux_core
 defaultarch = x86_64
 
 [openwrt]

bin/reproducible_alpine_scheduler.sh

@@ -121,7 +121,7 @@ update_alpine_repositories() {
 							AND s.architecture='x86_64'
 							AND s.name='$PKG'
 							AND s.suite='$SUITE';")
-						if [ "$PKG_STATUS" = "BLACKLISTED" ] ; then
+						if [ "$PKG_STATUS" = "blacklisted" ] ; then
 							echo "$PKG is blacklisted, so not scheduling it."
 							continue
 						else
@@ -199,7 +199,7 @@ update_alpine_repositories() {
 			FROM sources AS s JOIN results AS r ON s.id = r.package_id
 			WHERE s.distribution=$DISTROID
 			AND s.architecture='x86_64'
-			AND r.status != 'BLACKLISTED'
+			AND r.status != 'blacklisted'
 			AND r.build_date < '$MINDATE'
 			AND s.id NOT IN (SELECT schedule.package_id FROM schedule)
 			GROUP BY s.id, s.name

bin/reproducible_archlinux_scheduler.sh

@@ -121,7 +121,7 @@ update_archlinux_repositories() {
 							AND s.architecture='x86_64'
 							AND s.name='$PKG'
 							AND s.suite='$SUITE';")
-						if [ "$PKG_STATUS" = "BLACKLISTED" ] ; then
+						if [ "$PKG_STATUS" = "blacklisted" ] ; then
 							echo "$PKG is blacklisted, so not scheduling it."
 							continue
 						else
@@ -199,7 +199,7 @@ update_archlinux_repositories() {
 			FROM sources AS s JOIN results AS r ON s.id = r.package_id
 			WHERE s.distribution=$DISTROID
 			AND s.architecture='x86_64'
-			AND r.status != 'BLACKLISTED'
+			AND r.status != 'blacklisted'
 			AND r.build_date < '$MINDATE'
 			AND s.id NOT IN (SELECT schedule.package_id FROM schedule)
 			GROUP BY s.id, s.name

bin/reproducible_common.sh

@@ -986,7 +986,7 @@ include_icon(){
 	local PNG=
 	ALT=${ALT,,}
 	case $STATE in
-		BLACKLISTED)
+		blacklisted)
 			PNG=error;;
 		DEPWAIT_*)
 			PNG=weather-snow;;
@@ -996,7 +996,7 @@ include_icon(){
 			PNG=weather-storm;;
 		FTBR_*)
 			PNG=weather-showers-scattered ALT=unreproducible ;;
-		GOOD)
+		reproducible)
 			PNG=weather-clear ALT=reproducible ;;
 	esac
 	echo "       <img src=\"/userContent/static/$PNG.png\" alt=\"$ALT icon\" /> $TEXT" >> $HTML_BUFFER
@@ -1106,7 +1106,7 @@ create_pkg_html() {
 				WHERE s.architecture='x86_64'
 				AND s.name='$SRCPACKAGE'
 				AND s.suite='archlinux_$REPOSITORY';")
-			if [ "$STATE" = "BLACKLISTED" ] ; then
+			if [ "$STATE" = "blacklisted" ] ; then
 				buffer_message='blacklisted'
 			else
 				STATE=UNKNOWN
@@ -1120,7 +1120,7 @@ create_pkg_html() {
 			include_icon $STATE "$buffer_message"
 		fi
 	else
-		local STATE=GOOD
+		local STATE=reproducible
 		local SOME_GOOD=false
 		for ARTIFACT in $(cd $ARCHLINUX_PKG_PATH/ ; ls *.pkg.tar.xz.html) ; do
 			if [ -z "$(echo $ARTIFACT | grep $VERSION)" ] ; then
@@ -1283,7 +1283,7 @@ create_alpine_pkg_html() {
 				WHERE s.architecture='x86_64'
 				AND s.name='$SRCPACKAGE'
 				AND s.suite='alpine_$REPOSITORY';")
-			if [ "$STATE" = "BLACKLISTED" ] ; then
+			if [ "$STATE" = "blacklisted" ] ; then
 				buffer_message='blacklisted'
 			else
 				STATE=UNKNOWN
@@ -1297,7 +1297,7 @@ create_alpine_pkg_html() {
 			include_icon $STATE "$buffer_message"
 		fi
 	else
-		local STATE=GOOD
+		local STATE=reproducible
 		local SOME_GOOD=false
 		for ARTIFACT in $(cd $ALPINE_PKG_PATH/ ; ls *.apk.html) ; do
 			if [ -z "$(echo $ARTIFACT | grep $VERSION)" ] ; then

bin/reproducible_db_maintenance.py

@@ -688,6 +688,10 @@ schema_updates = {
         "INSERT INTO distributions (name) VALUES "
         "('openwrt')"
     ],
+    43: [
+        "UPDATE results SET status='reproducible' WHERE status='GOOD'",
+        "UPDATE results SET status='blacklisted' WHERE status='BLACKLISTED'"
+    ],
 }
 
 

bin/reproducible_html_alpine.sh

@@ -26,12 +26,12 @@ common_init "$@"
 get_state_from_counter() {
 	local counter=$1
 	case $counter in
-		0)	STATE=GOOD ;;
+		0)	STATE=reproducible ;;
 		1)	STATE=FTBR ;;
 		2)	STATE=FTBFS ;;
 		3)	STATE=DEPWAIT ;;
 		4)	STATE=404 ;;
-		5)	STATE=BLACKLISTED ;;
+		5)	STATE=blacklisted ;;
 		6)	STATE=UNKNOWN ;;
 	esac
 }
@@ -62,7 +62,7 @@ repostats(){
 		NR_FTBFS=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE 'FTBFS_%';")
 		NR_DEPWAIT=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE 'DEPWAIT_%';")
 		NR_404=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE '404_%';")
-		NR_BLACKLISTED=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status='BLACKLISTED';")
+		NR_BLACKLISTED=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status='blacklisted';")
 		NR_UNKNOWN=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND  s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE 'UNKNOWN_%';")
 		NR_UNTESTED=$(query_db "SELECT count(s.name) FROM sources AS s WHERE s.architecture='x86_64' AND s.distribution=$DISTROID AND s.suite='$SUITE' AND s.id NOT IN (SELECT package_id FROM results)")
 		if [ $NR_UNTESTED -ne 0 ] ; then
@@ -185,12 +185,12 @@ alpine_page_footer(){
 
 alpine_repostats_table(){
 	write_page "    <table><tr><th>repository</th><th>all source packages</th>"
-	write_page "     <th><a href='/alpine/state_GOOD.html'>reproducible</a></th>"
+	write_page "     <th><a href='/alpine/state_reproducible.html'>reproducible</a></th>"
 	write_page "     <th><a href='/alpine/state_FTBR.html'>unreproducible</a></th>"
 	write_page "     <th><a href='/alpine/state_FTBFS.html'>failing to build</a></th>"
 	write_page "     <th><a href='/alpine/state_DEPWAIT.html'>in depwait state</a></th>"
 	write_page "     <th><a href='/alpine/state_404.html'>download problems</a></th>"
-	write_page "     <th><a href='/alpine/state_BLACKLISTED.html'>blacklisted</a></th>"
+	write_page "     <th><a href='/alpine/state_blacklisted.html'>blacklisted</a></th>"
 	write_page "     <th><a href='/alpine/state_UNKNOWN.html'>unknown state</a></th></tr>"
 	cat $HTML_REPOSTATS >> $PAGE
 	write_page "    </table>"
@@ -248,7 +248,7 @@ repository_pages(){
 }
 
 state_pages(){
-	for STATE in FTBFS FTBR DEPWAIT 404 GOOD BLACKLISTED UNKNOWN ; do
+	for STATE in FTBFS FTBR DEPWAIT 404 reproducible blacklisted UNKNOWN ; do
 		PAGE=state_$STATE.html
 		TITLE="Reproducible alpine, packages in state $STATE"
 		alpine_page_header
@@ -305,7 +305,7 @@ state_pages(){
 repository_state_pages(){
 	for REPOSITORY in $ALPINE_REPOS ; do
 		SUITE="alpine_$REPOSITORY"
-		for STATE in FTBFS FTBR DEPWAIT 404 GOOD BLACKLISTED UNKNOWN ; do
+		for STATE in FTBFS FTBR DEPWAIT 404 reproducible blacklisted UNKNOWN ; do
 			PAGE=state_${REPOSITORY}_$STATE.html
 			TITLE="Reproducible alpine, packages in $REPOSITORY in state $STATE"
 			alpine_page_header

bin/reproducible_html_archlinux.sh

@@ -25,12 +25,12 @@ common_init "$@"
 get_state_from_counter() {
 	local counter=$1
 	case $counter in
-		0)	STATE=GOOD ;;
+		0)	STATE=reproducible ;;
 		1)	STATE=FTBR ;;
 		2)	STATE=FTBFS ;;
 		3)	STATE=DEPWAIT ;;
 		4)	STATE=404 ;;
-		5)	STATE=BLACKLISTED ;;
+		5)	STATE=blacklisted ;;
 		6)	STATE=UNKNOWN ;;
 	esac
 }
@@ -56,12 +56,12 @@ repostats(){
 		SUITE="archlinux_$REPOSITORY"
 		TOTAL=$(query_db "SELECT count(*) FROM sources AS s WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE';")
 		TESTED=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE';")
-		NR_GOOD=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status='GOOD';")
+		NR_GOOD=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status='reproducible';")
 		NR_FTBR=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE 'FTBR_%';")
 		NR_FTBFS=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE 'FTBFS_%';")
 		NR_DEPWAIT=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE 'DEPWAIT_%';")
 		NR_404=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE '404_%';")
-		NR_BLACKLISTED=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status='BLACKLISTED';")
+		NR_BLACKLISTED=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status='blacklisted';")
 		NR_UNKNOWN=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND  s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE 'UNKNOWN_%';")
 		NR_UNTESTED=$(query_db "SELECT count(s.name) FROM sources AS s WHERE s.architecture='x86_64' AND s.distribution=$DISTROID AND s.suite='$SUITE' AND s.id NOT IN (SELECT package_id FROM results)")
 		if [ $NR_UNTESTED -ne 0 ] ; then
@@ -184,12 +184,12 @@ archlinux_page_footer(){
 
 archlinux_repostats_table(){
 	write_page "    <table><tr><th>repository</th><th>all source packages</th>"
-	write_page "     <th><a href='/archlinux/state_GOOD.html'>reproducible</a></th>"
+	write_page "     <th><a href='/archlinux/state_reproducible.html'>reproducible</a></th>"
 	write_page "     <th><a href='/archlinux/state_FTBR.html'>unreproducible</a></th>"
 	write_page "     <th><a href='/archlinux/state_FTBFS.html'>failing to build</a></th>"
 	write_page "     <th><a href='/archlinux/state_DEPWAIT.html'>in depwait state</a></th>"
 	write_page "     <th><a href='/archlinux/state_404.html'>download problems</a></th>"
-	write_page "     <th><a href='/archlinux/state_BLACKLISTED.html'>blacklisted</a></th>"
+	write_page "     <th><a href='/archlinux/state_blacklisted.html'>blacklisted</a></th>"
 	write_page "     <th><a href='/archlinux/state_UNKNOWN.html'>unknown state</a></th></tr>"
 	cat $HTML_REPOSTATS >> $PAGE
 	write_page "    </table>"
@@ -247,7 +247,7 @@ repository_pages(){
 }
 
 state_pages(){
-	for STATE in FTBFS FTBR DEPWAIT 404 GOOD BLACKLISTED UNKNOWN ; do
+	for STATE in FTBFS FTBR DEPWAIT 404 reproducible blacklisted UNKNOWN ; do
 		PAGE=state_$STATE.html
 		TITLE="Reproducible archlinux, packages in state $STATE"
 		archlinux_page_header
@@ -304,7 +304,7 @@ state_pages(){
 repository_state_pages(){
 	for REPOSITORY in $ARCHLINUX_REPOS ; do
 		SUITE="archlinux_$REPOSITORY"
-		for STATE in FTBFS FTBR DEPWAIT 404 GOOD BLACKLISTED UNKNOWN ; do
+		for STATE in FTBFS FTBR DEPWAIT 404 reproducible blacklisted UNKNOWN ; do
 			PAGE=state_${REPOSITORY}_$STATE.html
 			TITLE="Reproducible archlinux, packages in $REPOSITORY in state $STATE"
 			archlinux_page_header

job-cfg/reproducible.yaml

@@ -572,6 +572,10 @@
                     my_description: 'Generate https://tests.reproducible-builds.org/archlinux/reproducible.json for Arch Linux.'
                     my_timed: '1 H/2 * * *'
                     my_shell: "/srv/jenkins/bin/reproducible_json.py --distro archlinux"
+                - 'archlinux_html_pages':
+                    my_description: 'Generate https://tests.reproducible-builds.org/archlinux/$suite html pages'
+                    my_timed: 'H H * * H'
+                    my_shell: 'cd /srv/jenkins/bin/ && ./reproducible_html_indexes.py --distro archlinux && ./reproducible_html_all_packages.py --distro archlinux --ignore-missing-files'
                 - 'html_archlinux':
                     my_description: 'Build webpages for Arch Linux reproducibility tests'
                     my_timed: '15,45 * * * *'