[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible Debian: use .git salsa url

[Holger Levsen]

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


Commits:
46d5d72b by Holger Levsen at 2020-08-14T17:12:41+02:00
reproducible Debian: use .git salsa url

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

- - - - -
b4d1083c by Holger Levsen at 2020-08-14T17:24:33+02:00
reproducible trbo system health check: detect a bunch of problems when updating meta pkg sets

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

- - - - -


2 changed files:

- bin/reproducible_create_meta_pkg_sets.sh
- bin/reproducible_system_health.sh


Changes:

=====================================
bin/reproducible_create_meta_pkg_sets.sh
=====================================
@@ -233,7 +233,7 @@ update_pkg_set_specific() {
 		had_a_DSA)
 			# packages which had a DSA
 			DSA=$(mktemp --tmpdir=$TEMPDIR pkg-sets-XXXXXXXXX -u)
-			git clone --depth 1 https://salsa.debian.org/security-tracker-team/security-tracker $DSA
+			git clone --depth 1 https://salsa.debian.org/security-tracker-team/security-tracker.git $DSA
 			cp $DSA/data/DSA/list ${TMPFILE2}
 			grep "^\[" ${TMPFILE2} | grep "DSA-" | cut -d " " -f5 > $TMPFILE
 			rm $DSA -r


=====================================
bin/reproducible_system_health.sh
=====================================
@@ -135,8 +135,20 @@ for JOB_NAME in reproducible_* ; do
 		echo "unstable job: $JOB_NAME"
 		let SCORE+=1 || SCORE=0
 		prepare_log
+		if [ "$JOB_NAME" = "reproducible_create_meta_pkg_sets" ] ; then
+			if $(grep -q " cp " $LOG) ; then
+				small_note " (outdated pkg set(s), manual intervention required)"
+			elif $(grep -q "could not download tail's latest packages file" $LOG) ; then
+				small_note " (problem with tails pkg set)"
+			elif $(grep -q "could not download cloud-image package list" $LOG) ; then
+				small_note " (problem with cloud-image pkg set)"
+			elif $(grep -q "could not download grml's latest dpkg.selections file" $LOG) ; then
+				small_note " (problem with grml  pkg set)"
+			elif $(grep -E -q "could not (download|determine) PureOS" $LOG) ; then
+				small_note " (problem with PureOS pkg set)"
+			fi
 		# only show the most severe problem, don't aggregate them
-		if $(grep -q "failed Squid Web Proxy Server" $LOG) ; then
+		elif $(grep -q "failed Squid Web Proxy Server" $LOG) ; then
 			small_note " (squid.service failed)"
 		elif $(grep -q "Kernel needs upgrade" $LOG) ; then
 			small_note " (reboot needed for kernel upgrade)"
@@ -289,9 +301,9 @@ conditional_paragraph() {
 			local MODIFIER=$(echo $LINE | cut -d '|' -f1)
 			local NAME=$(echo $LINE | cut -d '|' -f2)
 			local URL=$(echo $LINE | cut -d '|' -f3)
-			local JOB_GROUP=$(echo $NAME |rev | cut -d '_' -f2-|rev)
 			if [ "${2:0:12}" = "Ignored jobs" ] ; then
 				# we group ignored jobs so that they take up less visual space in the output
+				local JOB_GROUP=$(echo $NAME |rev | cut -d '_' -f2-|rev)
 				GROUP_MEMBERS=$(grep -c "${JOB_GROUP}_" $1)
 				if [ $GROUP_MEMBERS -gt 1 ] ; then
 					let GROUP_COUNTER+=1



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/8dbbe93afdd9a85f390d3562f847e441d1a4530a...b4d1083c69d373540c3bb16bc3ee7ada1ed8ae95

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/8dbbe93afdd9a85f390d3562f847e441d1a4530a...b4d1083c69d373540c3bb16bc3ee7ada1ed8ae95
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/20200814/10fe6a23/attachment-0001.html>