[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible debian: always build with all cores on all archs

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 15f3b81176be945769a15574afe682552e9d770c
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Mar 7 15:28:19 2016 +0100

    reproducible debian: always build with all cores on all archs
---
 bin/reproducible_build.sh  | 6 +-----
 bin/reproducible_common.sh | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 7b11cef..376764f 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -587,11 +587,7 @@ second_build() {
 	echo "============================================================================="
 	set -x
 	local TMPCFG=$(mktemp -t pbuilderrc_XXXX --tmpdir=$TMPDIR)
-	NEW_NUM_CPU=$NUM_CPU
-	# on armhf we cannot guarantee we have a different number of cores between 1st+2nd build due to the chosen nodes...
-	if [ "$ARCH" = "armhf" ] ; then
-		NEW_NUM_CPU=$(echo $NUM_CPU-1|bc)
-	fi
+	NEW_NUM_CPU=$NUM_CPU	# on amd64+i386 we vary this based on node choices (by design), on armhf only sometimes.
 	cat > "$TMPCFG" << EOF
 BUILDUSERID=2222
 BUILDUSERNAME=pbuilder2
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 99d5f3a..5091576 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -411,7 +411,7 @@ write_explaination_table() {
 		write_page "<tr><td>env USER</td><td>USER=\"pbuilder1\"</td><td>USER=\"pbuilder2\"</td></tr>"
 		write_page "<tr><td>uid</td><td>uid=1111</td><td>uid=2222</td></tr>"
 		write_page "<tr><td>gid</td><td>gid=1111</td><td>gid=2222</td></tr>"
-		write_page "<tr><td>env DEB_BUILD_OPTIONS</td><td>DEB_BUILD_OPTIONS=\"parallel=XXX\"<br />  XXX for amd64: 18 or 17<br />  XXX for armhf: 4 or 2</td><td>DEB_BUILD_OPTIONS=\"parallel=YYY\"<br />  YYY for amd64: 17 or 18 (!= the first build)<br />  YYY for armhf: 1 or 3</td></tr>"
+		write_page "<tr><td>env DEB_BUILD_OPTIONS</td><td>DEB_BUILD_OPTIONS=\"parallel=XXX\"<br />  XXX for amd64: 18 or 17<br />  XXX for armhf: 8, 4 or 2</td><td>DEB_BUILD_OPTIONS=\"parallel=YYY\"<br />  YYY for amd64: 17 or 18 (!= the first build)<br />  YYY for armhf: 8, 4, or 2 (not varied systematically)</td></tr>"
 		write_page "<tr><td>UTS namespace</td><td><em>shared with the host</em></td><td><em>modified using</em> /usr/bin/unshare --uts</td></tr>"
 	else
 		write_page "<tr><td>env USER</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td></tr>"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git