[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 3 commits: reproducible Debian: Give a longer timeout to gcc and binutils builds.
Holger Levsen (@holger)
gitlab at salsa.debian.org
Tue Apr 11 20:58:04 BST 2023
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
0d4ecc22 by Vagrant Cascadian at 2023-04-11T21:54:20+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>
- - - - -
779d434c by Vagrant Cascadian at 2023-04-11T21:54:29+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>
- - - - -
c5802292 by Holger Levsen at 2023-04-11T21:57:37+02:00
adjust sudoers for slightly changed puilder calls in previous two commits
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
4 changed files:
- bin/reproducible_build.sh
- hosts/common/etc/sudoers.d/jenkins
- hosts/ionos10-amd64/etc/sudoers.d/jenkins
- hosts/jenkins/etc/sudoers.d/jenkins
Changes:
=====================================
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.
=====================================
hosts/common/etc/sudoers.d/jenkins
=====================================
@@ -53,8 +53,8 @@ jenkins ALL= \
/bin/cp -rv /media/*, /usr/sbin/adduser jenkins docker \
/bin/chown -R jenkins\:jenkins /var/lib/jenkins/jobs/*, \
SETENV: NOPASSWD: /usr/sbin/pbuilder *, \
- SETENV: NOPASSWD: /usr/bin/timeout -k ??.?h ??h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder *, \
- SETENV: NOPASSWD: /usr/bin/timeout -k ??.?h ??h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder *, \
+ SETENV: NOPASSWD: /usr/bin/timeout * /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder *, \
+ SETENV: NOPASSWD: /usr/bin/timeout * /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder *, \
/bin/mv /var/cache/pbuilder/*base*.tgz /var/cache/pbuilder/*base*.tgz, \
/bin/rm /var/cache/pbuilder/*base*.tgz, \
/bin/rm -v /var/cache/pbuilder/*base*.tgz, \
=====================================
hosts/ionos10-amd64/etc/sudoers.d/jenkins
=====================================
@@ -40,8 +40,8 @@ jenkins ALL= \
/bin/cp -rv /media/*, \
/bin/chown -R jenkins\:jenkins /var/lib/jenkins/jobs/*,\
SETENV: NOPASSWD: /usr/sbin/pbuilder *, \
- SETENV: NOPASSWD: /usr/bin/timeout -k ??.?h ??h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder *, \
- SETENV: NOPASSWD: /usr/bin/timeout -k ??.?h ??h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder *, \
+ SETENV: NOPASSWD: /usr/bin/timeout * /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder *, \
+ SETENV: NOPASSWD: /usr/bin/timeout * /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder *, \
/bin/mv /var/cache/pbuilder/*base*.tgz /var/cache/pbuilder/*base*.tgz, \
/bin/rm /var/cache/pbuilder/*base*.tgz, \
/bin/rm -v /var/cache/pbuilder/*base*.tgz, \
=====================================
hosts/jenkins/etc/sudoers.d/jenkins
=====================================
@@ -47,8 +47,8 @@ jenkins ALL= \
/bin/cp -rv /media/*, \
/bin/chown -R jenkins\:jenkins /var/lib/jenkins/jobs/*,\
SETENV: NOPASSWD: /usr/sbin/pbuilder *, \
- SETENV: NOPASSWD: /usr/bin/timeout -k ??.?h ??h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder *, \
- SETENV: NOPASSWD: /usr/bin/timeout -k ??.?h ??h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder *, \
+ SETENV: NOPASSWD: /usr/bin/timeout * /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder *, \
+ SETENV: NOPASSWD: /usr/bin/timeout * /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder *, \
/bin/mv /var/cache/pbuilder/*base*.tgz /var/cache/pbuilder/*base*.tgz, \
/bin/rm /var/cache/pbuilder/*base*.tgz, \
/bin/rm -v /var/cache/pbuilder/*base*.tgz, \
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/6d3c1df913f8dc44c3bebd627e6509ddc8a9063e...c5802292a22a9d0600ca8015088809f808d42db0
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/6d3c1df913f8dc44c3bebd627e6509ddc8a9063e...c5802292a22a9d0600ca8015088809f808d42db0
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/f9c79c56/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list