[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Arch Linux: schedule 250 old ones if nothing else to do

[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 a75bf50a9fc38986c2e864f15de03ad8950bd23e
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Dec 8 10:17:52 2017 +0000

    reproducible Arch Linux: schedule 250 old ones if nothing else to do
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_archlinux_scheduler.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/bin/reproducible_archlinux_scheduler.sh b/bin/reproducible_archlinux_scheduler.sh
index 1d9b585..6e7e6a9 100755
--- a/bin/reproducible_archlinux_scheduler.sh
+++ b/bin/reproducible_archlinux_scheduler.sh
@@ -51,12 +51,6 @@ update_archlinux_repositories() {
 							echo $REPO/$pkgbase >> $UPDATED
 							echo "$(date -u ) - we know about $REPO/$pkgbase $VERSION, but the repo has $version, so rescheduling... "
 							touch $BASE/archlinux/$REPO/$pkgbase/pkg.needs_build
-						else
-							# schedule packages we already know about
-							# (but only until 300 packages are scheduled in total)
-							if [ $(find $BASE/archlinux/ -name pkg.needs_build | wc -l ) -le 300 ] ; then
-								touch $BASE/archlinux/$REPO/$pkgbase/pkg.needs_build
-							fi
 						fi
 					else
 						echo "$(date -u ) - scheduling new package $REPO/$pkgbase... though this is strange and should not really happen…"
@@ -71,15 +65,23 @@ update_archlinux_repositories() {
 		updated=$(grep -c ^$REPO $UPDATED || true)
 		echo "$(date -u ) - scheduled $new/$updated packages in repository '$REPO'."
 	done
+	# schedule 250 packages we already know about
+	# (only if less than 300 packages are currently scheduled)
+	# FIXME: this doesnt schedule packages without build1.log...
+	old=""
+	if [ $(find $BASE/archlinux/ -name pkg.needs_build | wc -l ) -le 300 ] ; then
+		find $BASE/archlinux/ -name build1.log -type f -printf '%T+ %p\n' | sort | head -n 250|cut -d " " -f2 | sed -s 's#build1.log$#pkg.needs_build#g' | args -r touch
+		old=", plus 250 old ones"
+	fi
 	total=$(find $BASE/archlinux/ -name pkg.needs_build | wc -l )
 	rm "$ARCHLINUX_PKGS"_full_pkgbase_list
 	schroot --end-session -c $SESSION
 	new=$(cat $NEW | wc -l 2>/dev/null|| true)
 	updated=$(cat $UPDATED 2>/dev/null| wc -l || true)
 	if [ $new -ne 0 ] || [ $updated -ne 0 ] ; then
-		irc_message archlinux-reproducible "scheduled $new entirely new packages and $updated packages with newer versions, for $total scheduled out of $TOTAL."
+		irc_message archlinux-reproducible "scheduled $new entirely new packages and $updated packages with newer versions$old, for $total scheduled out of $TOTAL."
 	fi
-	echo "$(date -u ) - scheduled $new/$updated packages."
+	echo "$(date -u ) - scheduled $new/$updated packages$old."
 	rm $NEW $UPDATED > /dev/null
 }
 

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