[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible Archlinux: refactoring

Tue Sep 25 23:51:34 BST 2018

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
bb120689 by Holger Levsen at 2018-09-25T21:45:08Z
reproducible Archlinux: refactoring

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
a0a5047b by Holger Levsen at 2018-09-25T22:39:47Z
reproducible Archlinux: create pages per repository

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- bin/reproducible_html_archlinux.sh


Changes:

=====================================
bin/reproducible_html_archlinux.sh
=====================================
@@ -34,6 +34,7 @@ ARCHLINUX_NR_BLACKLISTED=0
 ARCHLINUX_NR_UNKNOWN=0
 WIDTH=1920
 HEIGHT=960
+PAGE=''
 
 repostats(){
 	#
@@ -137,7 +138,6 @@ repostats(){
 }
 
 archlinux_page_header(){
-	local PAGE=$1
 	echo "$(date -u) - starting to build $PAGE"
 	cat > $PAGE <<- EOF
 	<!DOCTYPE html>
@@ -158,7 +158,12 @@ archlinux_page_header(){
 	EOF
 	write_page_intro 'Arch Linux'
 	write_variation_table 'Arch Linux'
-	write_page "    <table><tr><th>repository</th><th>all source packages</th><th>reproducible packages</th><th>unreproducible packages</th><th>packages failing to build</th><th>packages in depwait state</th><th>packages download problems</th><th>blacklisted</th><th>unknown state</th></tr>"
+}
+
+archlinux_page_footer(){
+	write_page "</div></div>"
+	write_page_footer 'Arch Linux'
+	echo "$(date -u) - enjoy $REPRODUCIBLE_URL/archlinux/$PAGE"
 }
 
 single_main_page(){
@@ -168,6 +173,7 @@ single_main_page(){
 	cd $ARCHBASE
 	PAGE=archlinux.html
 	archlinux_page_header $PAGE
+	write_page "    <table><tr><th>repository</th><th>all source packages</th><th>reproducible packages</th><th>unreproducible packages</th><th>packages failing to build</th><th>packages in depwait state</th><th>packages download problems</th><th>blacklisted</th><th>unknown state</th></tr>"
 	cat $HTML_REPOSTATS >> $PAGE
 	rm $HTML_REPOSTATS > /dev/null
 	write_page "    </table>"
@@ -178,22 +184,27 @@ single_main_page(){
 	done
 	write_page '</p><p style="clear:both;"><center>'
 	write_page "<a href=\"/archlinux/archlinux.png\"><img src=\"/archlinux/archlinux.png\" alt=\"total Arch Linux stats\"></a></p>"
-	# packages table header
-	write_page "    <table><tr><th>repository</th><th>source package</th><th>version</th><th>test result</th><th>test date<br />test duration</th><th>1st build log<br />2nd build log</th></tr>"
-	# output all HTML snipplets
-	for i in UNKNOWN $(for j in $MEMBERS_404 ; do echo 404_$j ; done) BLACKLISTED $(for j in $MEMBERS_DEPWAIT ; do echo DEPWAIT_$j ; done) $(for j in $MEMBERS_FTBFS ; do echo FTBFS_$j ; done) $(for j in $MEMBERS_FTBR ; do echo FTBR_$j ; done) GOOD ; do
-		for REPOSITORY in $ARCHLINUX_REPOS ; do
-			grep -l $i $REPOSITORY/*/pkg.state | sort -u | sed -s 's#\.state$#.html#g' | xargs -r cat >> $PAGE 2>/dev/null || true
-		done
-	done
-	write_page "    </table>"
-	write_page "</div></div>"
-	write_page_footer 'Arch Linux'
-	echo "$(date -u) - enjoy $REPRODUCIBLE_URL/archlinux/$PAGE"
+	archlinux_page_footer $PAGE
 }
 
 repository_pages(){
-	echo
+	for REPOSITORY in $ARCHLINUX_REPOS ; do
+		cd $ARCHBASE
+		PAGE=archlinux_$REPOSITORY.html
+		echo "$(date -u) - starting to write page for $REPOSITORY'."
+		archlinux_page_header $PAGE
+		# prepare stats per repository
+		SUITE="archlinux_$REPOSITORY"
+		REPO_PKGS=$(query_db "SELECT s.name FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.architecture='x86_64' AND s.suite='$SUITE' ORDER BY r.status")
+		# packages table header
+		write_page "    <table><tr><th>repository</th><th>source package</th><th>version</th><th>test result</th><th>test date<br />test duration</th><th>1st build log<br />2nd build log</th></tr>"
+		# output all HTML snipplets
+		for PKG in $REPO_PKGS ; do
+			cat $REPOSITORY/$PKG/pkg.html >> $PAGE 2>/dev/null || true
+		done
+		write_page "    </table>"
+		archlinux_page_footer $PAGE
+	done
 }
 
 



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/65086985ac72395c55a8a6f49e9075e22bf599ae...a0a5047b2cb57cfeedeb8ab01317e1a8638b8be7

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/65086985ac72395c55a8a6f49e9075e22bf599ae...a0a5047b2cb57cfeedeb8ab01317e1a8638b8be7
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20180925/a8ea4ba1/attachment-0001.html>
