[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] djm: correctly show # of manually triggered jenkins jobs (and stop showing...

[Holger Levsen (@holger)]

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


Commits:
b1127867 by Holger Levsen at 2023-06-05T13:39:24+02:00
djm: correctly show # of manually triggered jenkins jobs (and stop showing total job runs as its impossible to get right)

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

- - - - -


2 changed files:

- TODO
- bin/djm


Changes:

=====================================
TODO
=====================================
@@ -32,9 +32,7 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
 ** maybe: rm /tmp/mmdebstrap.* older than 3 days
 * split TODO in TODO and TODO.legacy?
 * djm:
-** "total jobs run" is buggy, see FIXME
 ** new feature: --show-month 04
-** --report: include hours with manual jobs triggered
 ** action: rk / remove-oldest-kernel
 ** action: sm / shell-monitor
 ** action: rj / restart-jenkins
@@ -44,12 +42,15 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
 ** action: s|top-builds: 1st stop build service, 2nd stop builds on all nodes
 ** option: --today to be used with action shell (and maybe others)
 ** option: --dont-wait4-enter, default being wait for enter.
+** option: --no-fetch
 ** write documentation for djm
 ** also log an id, so that one command effecting several hosts is counted as on action
 *** make actions triggering 'all' be only one entry in the djm logfile -> more sensible stats
 ** maybe:
 *** document running "mosh jenkins shell-monitor" processes?
 *** document jenkins plugin updates -> manually or though my local script which calls the webpages could log this more easily
+**** my local script should call djm and not write logfile entries itself...
+***** using DJM_BROWSER=${DJM_BROWSER:=firefox}
 *** include notmuch mails, "received and read". write djm-notmuch-parser.
 *** include irc. (timeslices when one said something on relevant channels)
 ** remove "so expect changes for some time." line


=====================================
bin/djm
=====================================
@@ -361,7 +361,7 @@ djm_report() {
 		html alpine archlinux builder_archlinux openwrt .*fedora builds opensuse .*strap
 		.*diffoscope reprotest disorderfs .*lfs" # .*(json|db|lfs)"
 	PIPE_PATTERNS=$(echo $PATTERNS | sed 's# #|#g')
-	HEADING="$(cat $TMP_LOGFILE | wc -l) jobs triggered manually:"
+	HEADING="$(cat $UI_LOGFILE | wc -l) jobs triggered manually:"
 	printf_heading "$HEADING"
 	(
 		for i in $PATTERNS  ; do
@@ -372,21 +372,7 @@ djm_report() {
 		done
 	) | sort -n -r
 
-	if $VERBOSE ; then
-		seperator
-		HEADING="$(cat $PARSER_CACHE | wc -l) total jobs run:" # FIXME: this misses job runs not in cache...
-		printf_heading "$HEADING"
-		(
-			for i in $PATTERNS  ; do
-				printf_if_not_zero "$TWO_C" $(grep -c reproducible_$i $PARSER_CACHE) "reproducible_${i}_.*"
-			done
-			for i in $(cut -d '/' -f2 $PARSER_CACHE | grep -v -E $PIPE_PATTERNS|sort -u) ; do
-				printf_if_not_zero "$TWO_C" $(grep -c $i $PARSER_CACHE) "$i"
-			done
-		) | sort -n -r
-	fi
 	seperator "="
-
 	rm $TMP_LOGFILE
 
 }



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/b112786722fcf6a5922021965ebd7589a63aa047

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/b112786722fcf6a5922021965ebd7589a63aa047
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/20230605/58432afe/attachment-0001.htm>