[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 3 commits: reproducible Archlinux: fixup scheduling of old packages

[Holger Levsen]

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


Commits:
2738c0f2 by Holger Levsen at 2018-09-26T00:13:58Z
reproducible Archlinux: fixup scheduling of old packages

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

- - - - -
31884af9 by Holger Levsen at 2018-09-26T00:19:30Z
reproducible Archlinux: try to fixup state pages

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

- - - - -
496b3af5 by Holger Levsen at 2018-09-26T00:20:29Z
reproducible Archlinux: run html job every other hour

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

- - - - -


3 changed files:

- bin/reproducible_archlinux_scheduler.sh
- bin/reproducible_html_archlinux.sh
- job-cfg/reproducible.yaml


Changes:

=====================================
bin/reproducible_archlinux_scheduler.sh
=====================================
@@ -163,7 +163,7 @@ update_archlinux_repositories() {
 			ORDER BY max_date
 			LIMIT $MAX;"
 		OLD=$(query_db "$QUERY")
-		for PKG_ID in $(cut -d '|' -f1 $OLD) ; do
+		for PKG_ID in $(echo -n "$OLD" | cut -d '|' -f1) ; do
 			QUERY="INSERT INTO schedule (package_id, date_scheduled) VALUES ('${PKG_ID}', '$SCHDATE');"
 			query_db "$QUERY_DB"
 		done
@@ -179,7 +179,7 @@ update_archlinux_repositories() {
 	total=$(query_db "SELECT count(*) FROM sources AS s JOIN schedule AS sch ON s.id=sch.package_id WHERE s.architecture='x86_64' AND sch.date_build_started IS NULL;")
 	new=$(cat $NEW | wc -l 2>/dev/null|| true)
 	updated=$(cat $UPDATED 2>/dev/null| wc -l || true)
-	old=$(cat $OLD | wc -l 2>/dev/null|| true)
+	old=$(echo -n "$OLD" | wc -l 2>/dev/null|| true)
 	if [ $new -ne 0 ] || [ $updated -ne 0 ] || [ $old -ne 0 ] ; then
 		message="scheduled"
 		if [ $new -ne 0 ] ; then


=====================================
bin/reproducible_html_archlinux.sh
=====================================
@@ -238,11 +238,11 @@ state_pages(){
 		for REPOSITORY in $ARCHLINUX_REPOS ; do
 			SUITE="archlinux_$REPOSITORY"
 			STATE_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' AND r.status LIKE '$STATE%' ORDER BY s.suite,r.status")
-			for PKG in $STATE_PKGS ; do
+			for PKG in ${STATE_PKGS} ; do
 				cat $ARCHBASE/$REPOSITORY/$PKG/pkg.html >> $PAGE 2>/dev/null || true
 			done
-			STATE_PKGS=$(query_db "SELECT s.name FROM sources AS s WHERE s.architecture='x86_64' AND s.id NOT IN (SELECT package_id FROM results)")
-			for PKG in $STATE_PKGS ; do
+			STATE_PKGS=$(query_db "SELECT s.name FROM sources AS s WHERE s.architecture='x86_64' AND s.suite='$SUITE' AND s.id NOT IN (SELECT package_id FROM results)")
+			for PKG in ${STATE_PKGS} ; do
 				cat $ARCHBASE/$REPOSITORY/$PKG/pkg.html >> $PAGE 2>/dev/null || true
 			done
 		done


=====================================
job-cfg/reproducible.yaml
=====================================
@@ -532,7 +532,7 @@
                     my_shellext: ".py"
                 - 'html_archlinux':
                     my_description: 'Build a simple webpage for Arch Linux reproducibility tests'
-                    my_timed: ''
+                    my_timed: '1 H/2 * * *'
                 - 'archlinux_scheduler':
                     my_description: 'A simple scheduler for for Arch Linux reproducibility tests'
                     my_timed: '0 H/3 * * *'



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/fa02c441cc7ab91f1fea9a5f7b3a43afe8db7636...496b3af50afe23d40bc2568ee594228881cc073d

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/fa02c441cc7ab91f1fea9a5f7b3a43afe8db7636...496b3af50afe23d40bc2568ee594228881cc073d
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/20180926/749faac1/attachment-0001.html>