[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 3 commits: thanks.html: refactor

[Holger Levsen]

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


Commits:
4809520f by Holger Levsen at 2020-10-27T23:59:54+01:00
thanks.html: refactor

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

- - - - -
4b4f5122 by Holger Levsen at 2020-10-28T00:01:29+01:00
thanks.html: recognize a few more git author strings as duplicates

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

- - - - -
ee2dfca0 by Holger Levsen at 2020-10-28T00:06:02+01:00
Revert "reproducible Debian: temporarily ease debugging of index_oldsuites"

This reverts commit be329ddd8fb03bbea951e3c5f6c4ae12a58a93db.

- - - - -


2 changed files:

- bin/reproducible_html_dashboard.sh
- update_jdn.sh


Changes:

=====================================
bin/reproducible_html_dashboard.sh
=====================================
@@ -778,17 +778,17 @@ for ARCH in ${ARCHS} ; do
 		update_suite_arch_stats
 		gather_suite_arch_stats
 		# stretch and buster pages are only updated every 12h
-		#if ( [ "$SUITE" = "stretch" ] || [ "$SUITE" = "buster" ] ) && [[ $(($(date +%k) % 12)) -ne 0 ]]; then
-		#		continue
-		#fi
+		if ( [ "$SUITE" = "stretch" ] || [ "$SUITE" = "buster" ] ) && [[ $(($(date +%k) % 12)) -ne 0 ]]; then
+				continue
+		fi
 		create_suite_arch_stats_page
 	done
 done
 create_performance_page
 create_variations_page
 create_bugs_page
-#if [[ $(($(date +%k) % 12)) -eq 0 ]]; then
+if [[ $(($(date +%k) % 12)) -eq 0 ]]; then
 	create_oldsuites_page
-#fi
+fi
 create_dashboard_page
 rm -f $DUMMY_FILE >/dev/null


=====================================
update_jdn.sh
=====================================
@@ -778,8 +778,9 @@ if [ "$HOSTNAME" = "jenkins" ] ; then
 	git log | grep ^Author| cut -d " " -f2-|sort -u -f > $TMPFILE
 	echo "----" >> $TMPFILE
 	sudo tee /var/lib/jenkins/userContent/THANKS > /dev/null < THANKS.head
-	# samuel, lunar, jelle, josch and phil committed with several committers, only display one
-	grep -v -e "samuel.thibault at ens-lyon.org" -e Lunar -e "j.schauer at email.de" -e "mattia at mapreri.org" -e "phil at jenkins-test-vm" -e "jelle at vdwaa.nl" $TMPFILE | sudo tee -a /var/lib/jenkins/userContent/THANKS > /dev/null
+	# several people committed with several committers, only display one
+	DUPLICATES="samuel.thibault at ens-lyon.org|Jérémy Bobbio|j.schauer at email.de|mattia at mapreri.org|phil at jenkins-test-vm|jelle at vdwaa.nl|<kpcyrd>|vagrant at debian.org"
+	grep -E -v "DUPLICATES" $TMPFILE | sudo tee -a /var/lib/jenkins/userContent/THANKS > /dev/null
 	rm $TMPFILE
 	TMPDIR=$(mktemp -d -t update-jdn-XXXXXXXX)
 	sudo cp -pr userContent $TMPDIR/



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/993fac3bd6006c22c527396d690cb4b1d0911ddd...ee2dfca084995139d08e73085ada376f30a6ab7c

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/993fac3bd6006c22c527396d690cb4b1d0911ddd...ee2dfca084995139d08e73085ada376f30a6ab7c
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/20201027/68e7e83f/attachment-0001.html>