[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 4 commits: reproducible trbo system health check: trivial fix

[Holger Levsen]

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


Commits:
a7bd7c73 by Holger Levsen at 2020-08-08T14:23:45+02:00
reproducible trbo system health check: trivial fix

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

- - - - -
b0c0ef61 by Holger Levsen at 2020-08-08T14:38:33+02:00
reproducible trbo system health check: condense view of ignored jobs

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

- - - - -
01b05903 by Holger Levsen at 2020-08-08T14:39:35+02:00
Revert "reproducible: disable e archlinux html pages job as it has never worked"

This reverts commit 40905dce7f18ae6fbd0860d92712ce76e2381e1e.

- - - - -
90a3ce91 by Holger Levsen at 2020-08-08T14:40:23+02:00
reproducible: really disable archlinux html pages job as it has never worked

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

- - - - -


2 changed files:

- bin/reproducible_system_health.sh
- job-cfg/reproducible.yaml


Changes:

=====================================
bin/reproducible_system_health.sh
=====================================
@@ -146,7 +146,7 @@ for JOB_NAME in reproducible_* ; do
 			small_note " (rc-local.service failed)"
 		elif $(grep -E -q "failed Session [0-9]+ of user jenkins" $LOG) ; then
 			small_note " (session failed for user jenkins)"
-		elif $(grep -E "^Warning: processes found which should not be there and which could not be killed." $LOG) ; then
+		elif $(grep -E -q "^Warning: processes found which should not be there and which could not be killed." $LOG) ; then
 			small_note " (unkillable unwanted processes)"
 		elif $(grep -q "failed failed pbuilder_build" $LOG) ; then
 			small_note " (pbuilder build scope failed)"
@@ -276,6 +276,8 @@ conditional_paragraph() {
 		write2healthfile " <p>"
 		write2healthfile "  $2:"
 		write2healthfile "  <ul>"
+		local AHREF=""
+		local GROUP_COUNTER=0
 		OFS=$IFS
 		IFS=$'\012'
 		for LINE in $(cat $1 | sort -t '|' -n ) ; do
@@ -284,19 +286,46 @@ conditional_paragraph() {
 			local MODIFIER=$(echo $LINE | cut -d '|' -f1)
 			local NAME=$(echo $LINE | cut -d '|' -f2)
 			local URL=$(echo $LINE | cut -d '|' -f3)
-			local BADGE=$(echo $LINE | cut -d '|' -f4)
-			local NOTE=$(echo $LINE | cut -d '|' -f5)
-			if [ "$BADGE" = "true" ] ; then
-				local LINK="<img src=\"$URL/badge/icon\">$NAME"
+			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
+				GROUP_MEMBERS=$(grep -c "${JOB_GROUP}_" $1)
+				if [ $GROUP_MEMBERS -gt 1 ] ; then
+					let GROUP_COUNTER+=1
+					local JOB_SUFFIX=$(echo $NAME |rev | cut -d '_' -f1|rev)
+					if [ -z "$AHREF" ] ; then
+						AHREF=" ${JOB_GROUP} <a href=\"$URL/\">_${JOB_SUFFIX}</a>"
+					else
+						AHREF="$AHREF <a href=\"$URL/\">_${JOB_SUFFIX}</a>"
+					fi
+					if [ $GROUP_COUNTER -ne $GROUP_MEMBERS ] ; then
+						# not enough group members found
+						continue
+					fi
+					# else, we are done grouping
+				else
+					# not part of a group
+					AHREF="<a href=\"$URL/\">$NAME</a>"
+				fi
 			else
-				local LINK="$NAME"
+				local BADGE=$(echo $LINE | cut -d '|' -f4)
+				local NOTE=$(echo $LINE | cut -d '|' -f5)
+				if [ "$BADGE" = "true" ] ; then
+					local LINK="<img src=\"$URL/badge/icon\">$NAME"
+				else
+					local LINK="$NAME"
+				fi
+				if [ "$MODIFIER" = "1" ] ; then
+					local MOREINFO="$NOTE"
+				else
+					local MOREINFO="$NOTE <em>($MODIFIER)</em>"
+				fi
+				AHREF="<a href=\"$URL/\">$LINK</a>$MOREINFO"
 			fi
-			if [ "$MODIFIER" = "1" ] ; then
-				local MOREINFO="$NOTE"
-			else
-				local MOREINFO="$NOTE <em>($MODIFIER)</em>"
-			fi
-			write2healthfile "   <li><a href=\"$URL/\">$LINK</a>$MOREINFO</li>"
+			write2healthfile "   <li>$AHREF</li>"
+			# reset variables for next job (group)
+			AHREF=""
+			GROUP_COUNTER=0
 		done
 		IFS=$OFS
 		write2healthfile "  </ul>"


=====================================
job-cfg/reproducible.yaml
=====================================
@@ -591,10 +591,10 @@
                     my_description: 'Generate https://tests.reproducible-builds.org/archlinux/$suite html pages'
                     my_timed: 'H H * * H'
                     my_shell: 'cd /srv/jenkins/bin/ && ./reproducible_html_indexes.py --distro archlinux && ./reproducible_html_all_packages.py --distro archlinux --ignore-missing-files'
+                    my_disabled: true
                 - 'html_archlinux':
                     my_description: 'Build webpages for Arch Linux reproducibility tests'
                     my_timed: '15,45 * * * *'
-                    my_disabled: true
                 - 'archlinux_scheduler':
                     my_description: 'Scheduler for Arch Linux reproducibility tests'
                     my_timed: '0 H/4 * * *'



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/4654af22bb5b2407acde144beffea6eefdab7bb5...90a3ce915f70de928d0ce87d3ad805139d793275

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/4654af22bb5b2407acde144beffea6eefdab7bb5...90a3ce915f70de928d0ce87d3ad805139d793275
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/20200808/58382824/attachment-0001.html>