[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: fix grammar s/build/built/

Wed Jun 20 12:59:29 BST 2018

Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net


Commits:
968699f6 by Mattia Rizzolo at 2018-06-20T13:34:04+02:00
fix grammar s/build/built/

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
a903dd7b by Mattia Rizzolo at 2018-06-20T13:57:47+02:00
reproducible debian: build.sh: apply the 120m timeout directly to diffoscope instead of the wrapping schroot

We are seeing schroot errors like the following, that I believe would be
fixed by SIGTERMing diffoscope directly instead of schroot → sh →
diffoscope.

+ local TIMEOUT=120m
+ DBDSUITE=unstable
+ '[' unstable = experimental ']'
+ set -x
++ mktemp --tmpdir=/srv/reproducible-results/rbuild-debian/tmp.OQJmsWHPbc -d dbd-tmp-XXXXXXX
+ local TEMP=/srv/reproducible-results/rbuild-debian/tmp.OQJmsWHPbc/dbd-tmp-aiOGwgn
++ schroot --begin-session -c chroot:jenkins-reproducible-unstable-diffoscope
+ local session=jenkins-reproducible-unstable-diffoscope-ebd86728-8ca4-4419-8c00-e9b25b6f286f
++ schroot --directory /srv/reproducible-results/rbuild-debian/tmp.OQJmsWHPbc --run-session -c jenkins-reproducible-unstable-diffoscope-ebd86728-8ca4-4419-8c00-e9b25b6f286f diffoscope -- --version
+ DIFFOSCOPE='diffoscope 96'
+ log_info 'diffoscope 96 will be used to compare the two builds:'
+ _log I: 'diffoscope 96 will be used to compare the two builds:'
+ local prefix=I:
+ shift 1
+ tee -a /var/lib/jenkins/userContent/reproducible/debian/rbuild/unstable/arm64/gcc-5_5.5.0-12.rbuild.log
++ date -u
+ echo -e 'Wed Jun 20 09:34:15 UTC 2018  I: diffoscope 96 will be used to compare the two builds:'
Wed Jun 20 09:34:15 UTC 2018  I: diffoscope 96 will be used to compare the two builds:
+ set +e
+ set -x
+ timeout 120m nice schroot --directory /srv/reproducible-results/rbuild-debian/tmp.OQJmsWHPbc --run-session -c jenkins-reproducible-unstable-diffoscope-ebd86728-8ca4-4419-8c00-e9b25b6f286f -- sh -c 'export TMPDIR=/srv/reproducible-results/rbuild-debian/tmp.OQJmsWHPbc/dbd-tmp-aiOGwgn ; diffoscope 			--html /srv/reproducible-results/rbuild-debian/tmp.OQJmsWHPbc/gcc-5_5.5.0-12.diffoscope.html 			--text /srv/reproducible-results/rbuild-debian/tmp.OQJmsWHPbc/gcc-5_5.5.0-12.diffoscope.txt 			--profile=- 			/srv/reproducible-results/rbuild-debian/tmp.OQJmsWHPbc/b1/gcc-5_5.5.0-12_arm64.changes 			/srv/reproducible-results/rbuild-debian/tmp.OQJmsWHPbc/b2/gcc-5_5.5.0-12_arm64.changes'
+ RESULT=124
+ false
+ set +x
E: Caught signal ‘Terminated’: terminating immediately
E: Caught signal ‘Terminated’
E: 10mount: umount: /run/schroot/mount/jenkins-reproducible-unstable-diffoscope-ebd86728-8ca4-4419-8c00-e9b25b6f286f/srv/reproducible-results: target is busy
E: 10mount:         (In some cases useful info about processes that
E: 10mount:          use the device is found by lsof(8) or fuser(1).)
E: 10mount: umount: /run/schroot/mount/jenkins-reproducible-unstable-diffoscope-ebd86728-8ca4-4419-8c00-e9b25b6f286f: target is busy
E: 10mount:         (In some cases useful info about processes that
E: 10mount:          use the device is found by lsof(8) or fuser(1).)
E: 10mount: rmdir: failed to remove '/var/run/schroot/mount/jenkins-reproducible-unstable-diffoscope-ebd86728-8ca4-4419-8c00-e9b25b6f286f': Device or resource busy
E: jenkins-reproducible-unstable-diffoscope-ebd86728-8ca4-4419-8c00-e9b25b6f286f: Chroot setup failed: stage=setup-stop
Starting cleanup.

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


2 changed files:

- bin/reproducible_build.sh
- bin/reproducible_html_dashboard.sh


Changes:

=====================================
bin/reproducible_build.sh
=====================================

--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -392,14 +392,12 @@ call_diffoscope_on_changes_files() {
 	# filter lines describing .buildinfo files from .changes file
 	sed -i -e '/^ [a-f0-9]\{32,64\} .*\.buildinfo$/d' b{1,2}/$CHANGES
 	local TMPLOG=$(mktemp --tmpdir=$TMPDIR)
-	local TIMEOUT="120m"
+	local TIMEOUT="120m"  # note that below there is another instance of this + 5 minutes
 	DBDSUITE=$SUITE
 	if [ "$SUITE" = "experimental" ] ; then
 		# there is no extra diffoscope-schroot for experimental ( because we specical case ghc enough already )
 		DBDSUITE="unstable"
 	fi
-	# to debug diffoscope/schroot problems
-	set -x
 	# diffoscope temporary files are going to end up in this
 	local TEMP=$(mktemp --tmpdir=$TMPDIR -d dbd-tmp-XXXXXXX)
 	local session="$(schroot --begin-session -c "chroot:jenkins-reproducible-$DBDSUITE-diffoscope")"
@@ -407,11 +405,11 @@ call_diffoscope_on_changes_files() {
 	log_info "$DIFFOSCOPE will be used to compare the two builds:"
 	set +e
 	set -x
-	( timeout $TIMEOUT nice schroot \
+	( timeout 125m nice schroot \
 		--directory $TMPDIR \
 		--run-session \
 		-c "$session" \
-		-- sh -c "export TMPDIR=$TEMP ; diffoscope \
+		-- sh -c "export TMPDIR=$TEMP ; timeout $TIMEOUT diffoscope \
 			--html $TMPDIR/${DBDREPORT} \
 			--text $TMPDIR/$DBDTXT \
 			--profile=- \


=====================================
bin/reproducible_html_dashboard.sh
=====================================
--- a/bin/reproducible_html_dashboard.sh
+++ b/bin/reproducible_html_dashboard.sh
@@ -487,7 +487,7 @@ create_suite_arch_stats_page() {
 	if [ "$ARCH" = "armhf" ] || [ "$ARCH" = "arm64" ]; then
 		ARMSPECIALARCH=" 'any-arm',"
 	fi
-	write_page "$COUNT_NOTFORUS ($PERCENT_NOTFORUS%) packages which are neither Architecture: 'any', 'all', '$ARCH', 'linux-any', 'linux-$ARCH'$ARMSPECIALARCH nor 'any-$ARCH' will not be build here.<br />"
+	write_page "$COUNT_NOTFORUS ($PERCENT_NOTFORUS%) packages which are neither Architecture: 'any', 'all', '$ARCH', 'linux-any', 'linux-$ARCH'$ARMSPECIALARCH nor 'any-$ARCH' will not be built here.<br />"
 	set_icon blacklisted
 	write_icon
 	write_page "$COUNT_BLACKLISTED ($PERCENT_BLACKLISTED%) packages have been blacklisted on $SUITE/$ARCH.<br />"



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/84da48105773e21b09e7a5b96e5395aa420df532...a903dd7b539cdf37e8ec11723252d2256d784b5f

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/84da48105773e21b09e7a5b96e5395aa420df532...a903dd7b539cdf37e8ec11723252d2256d784b5f
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/20180620/05492623/attachment-0001.html>
