[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 4 commits: djm-logparser: add option to skip creating+fetching remote results

[Holger Levsen (@holger)]

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


Commits:
3209dcd6 by Holger Levsen at 2023-04-10T20:21:05+02:00
djm-logparser: add option to skip creating+fetching remote results

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

- - - - -
6305559d by Holger Levsen at 2023-04-10T21:14:18+02:00
djm-logparser: include number of reproducible related jenkins jobs

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

- - - - -
ea5d7b16 by Vagrant Cascadian at 2023-04-10T23:06:00+02:00
reproducible Debian: Give a longer timeout to gcc and binutils builds.

These are important packages from the build-essential that are near
the current default timeout.

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

- - - - -
ca2f8f92 by Vagrant Cascadian at 2023-04-10T23:06:05+02:00
Use PBUILDERTIMEOUT variable and make timeouts smaller to fix within
the 48 hour cleanup windows.

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

- - - - -


2 changed files:

- bin/djm-logparser
- bin/reproducible_build.sh


Changes:

=====================================
bin/djm-logparser
=====================================
@@ -21,12 +21,16 @@ fi
 LOCAL_LOGFILE=~/.djm.log
 UI_LOGFILE=~/.djm-jenkins-ui.log
 LOGMONTH="$(date -u '+%Y-%m')"
+JOBS=~/.djm-jobs.txt
 
 #
 # parse jenkins build logs and copy the result over
 #
-ssh $DJM_USER at jenkins.debian.net "DJM_USER=$DJM_USER /srv/jenkins/bin/djm-jenkins-parser"
-scp $DJM_USER at jenkins.debian.net:$(basename $UI_LOGFILE) $UI_LOGFILE
+if [ -z "$1" ] ; then
+	ssh $DJM_USER at jenkins.debian.net "DJM_USER=$DJM_USER /srv/jenkins/bin/djm-jenkins-parser"
+	scp $DJM_USER at jenkins.debian.net:$(basename $UI_LOGFILE) $UI_LOGFILE
+	ssh $DJM_USER at jenkins.debian.net "cd ~jenkins/jobs ; ls -1d reproducible_* |wc -l" > $JOBS
+fi
 
 #
 # little helpers
@@ -74,6 +78,7 @@ printf "$TWO_C" "month:" "$LOGMONTH"
 seperator
 printf "$TWO_C" "djm actions:" "$TOTAL"
 printf "$TWO_C" "hosts maintained:" "$HOSTS"
+printf "$TWO_C" "jenkins jobs maintained:" "$(cat $JOBS)"
 seperator
 printf "$TWO_C" "hours with djm usage:" "${HOURS}"
 printf "$TWO_C" " ten minute slices with djm usage:" "$TEN_MIN_SLICES"
@@ -118,9 +123,4 @@ printf "$ONE_C" "---------------"
 ) | sort -n -r
 seperator "="
 
-# todo: include the number of reproducible related jenkins jobs
-# todo: include notmuch mails
-# - received but read
-# - written
-
 rm $LOGFILE


=====================================
bin/reproducible_build.sh
=====================================
@@ -644,9 +644,13 @@ EOF
 				;;
 		esac
 	fi
+	case "${SRCPACKAGE}" in
+		gcc-*|binutils) PBUILDERTTIMEOUT=19 ;;
+		*) PBUILDERTIMEOUT=18 ;;
+	esac
 	set +e
 	# remember to change the sudoers setting if you change the following command
-	sudo timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice \
+	sudo timeout -k ${PBUILDERTIMEOUT}.1h ${PBUILDERTIMEOUT}h /usr/bin/ionice -c 3 /usr/bin/nice \
 	  /usr/sbin/pbuilder --build \
 		--configfile $TMPCFG \
 		--distribution "$SUITE" \
@@ -663,7 +667,7 @@ EOF
 	rm $TMPCFG
 	case $PRESULT in
 		124)
-			echo "$(date -u) - pbuilder was killed by timeout after 18h." | tee -a b1/build.log
+			echo "$(date -u) - pbuilder was killed by timeout after ${PBUILDERTIMEOUT}h." | tee -a b1/build.log
 			exit 3
 			;;
 		1)  # FTBFS, for whatever reason.
@@ -763,11 +767,15 @@ EOF
 				;;
 		esac
 	fi
+	case "${SRCPACKAGE}" in
+		gcc-*|binutils) PBUILDERTIMEOUT=26 ;;
+		*) PBUILDERTIMEOUT=24 ;;
+	esac
 	set +e
 	# remember to change the sudoers setting if you change the following command
 	# (the 2nd build gets a longer timeout trying to make sure the first build
 	# aint wasted when then 2nd happens on a highly loaded node)
-	sudo timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 \
+	sudo timeout -k ${PBUILDERTIMEOUT}.1h ${PBUILDERTIMEOUT}h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 \
 		/usr/bin/unshare --uts -- \
 		/usr/sbin/pbuilder --build \
 			--configfile $TMPCFG \
@@ -786,7 +794,7 @@ EOF
 	rm $TMPCFG
 	case $PRESULT in
 		124)
-			echo "$(date -u) - pbuilder was killed by timeout after 24h." | tee -a b2/build.log
+			echo "$(date -u) - pbuilder was killed by timeout after ${PBUILDERTIMEOUT}h." | tee -a b2/build.log
 			exit 3
 			;;
 		1)  # FTBFS, for whatever reason.



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/d97ccbdab568fefcd727eb9fe6954a15ea048b21...ca2f8f9276543e9aa539dd8f12afb1fcdb6e4116

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/d97ccbdab568fefcd727eb9fe6954a15ea048b21...ca2f8f9276543e9aa539dd8f12afb1fcdb6e4116
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/20230410/fd3dff99/attachment-0001.htm>