[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: Revert "Use PBUILDERTIMEOUT variable and make timeouts smaller to fix within"

[Holger Levsen (@holger)]

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


Commits:
d6cc4f24 by Holger Levsen at 2023-04-11T11:46:06+02:00
Revert "Use PBUILDERTIMEOUT variable and make timeouts smaller to fix within"

This reverts commit ca2f8f9276543e9aa539dd8f12afb1fcdb6e4116.

- - - - -
8b4420b6 by Holger Levsen at 2023-04-11T11:46:13+02:00
Revert "reproducible Debian: Give a longer timeout to gcc and binutils builds."

This reverts commit ea5d7b160a9e7714996a8ce77d5713d969c59272.

- - - - -


1 changed file:

- bin/reproducible_build.sh


Changes:

=====================================
bin/reproducible_build.sh
=====================================
@@ -644,13 +644,9 @@ 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 ${PBUILDERTIMEOUT}.1h ${PBUILDERTIMEOUT}h /usr/bin/ionice -c 3 /usr/bin/nice \
+	sudo timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice \
 	  /usr/sbin/pbuilder --build \
 		--configfile $TMPCFG \
 		--distribution "$SUITE" \
@@ -667,7 +663,7 @@ EOF
 	rm $TMPCFG
 	case $PRESULT in
 		124)
-			echo "$(date -u) - pbuilder was killed by timeout after ${PBUILDERTIMEOUT}h." | tee -a b1/build.log
+			echo "$(date -u) - pbuilder was killed by timeout after 18h." | tee -a b1/build.log
 			exit 3
 			;;
 		1)  # FTBFS, for whatever reason.
@@ -767,15 +763,11 @@ 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 ${PBUILDERTIMEOUT}.1h ${PBUILDERTIMEOUT}h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 \
+	sudo timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 \
 		/usr/bin/unshare --uts -- \
 		/usr/sbin/pbuilder --build \
 			--configfile $TMPCFG \
@@ -794,7 +786,7 @@ EOF
 	rm $TMPCFG
 	case $PRESULT in
 		124)
-			echo "$(date -u) - pbuilder was killed by timeout after ${PBUILDERTIMEOUT}h." | tee -a b2/build.log
+			echo "$(date -u) - pbuilder was killed by timeout after 24h." | 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/ca2f8f9276543e9aa539dd8f12afb1fcdb6e4116...8b4420b6c167f4b274a0d40d691d56db41e2dd4a

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/ca2f8f9276543e9aa539dd8f12afb1fcdb6e4116...8b4420b6c167f4b274a0d40d691d56db41e2dd4a
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/20230411/4827bf96/attachment-0001.htm>