[Qa-jenkins-scm] [jenkins.debian.net] 02/02: reproducible: always use all cores for the 2nd build on armhf

[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 0c2430b06357b78249d92288a8c77fe77919eec5
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Sep 9 17:01:00 2015 +0200

    reproducible: always use all cores for the 2nd build on armhf
---
 bin/reproducible_build.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 27a82b2..518531e 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -473,10 +473,15 @@ EOF
 second_build() {
 	set -x
 	local TMPCFG=$(mktemp -t pbuilderrc_XXXX --tmpdir=$TMPDIR)
+	NEW_NUM_CPU=$(echo $NUM_CPU-1|bc)
+	# on armhf we always have different number of cores between 1st+2nd build due to the chosen nodes
+	if [ "$ARCH" = "armhf" ] ; then
+		NEW_NUM_CPU=$NUM_CPU
+	fi
 	cat > "$TMPCFG" << EOF
 BUILDUSERID=2222
 BUILDUSERNAME=pbuilder2
-export DEB_BUILD_OPTIONS="parallel=$(echo $NUM_CPU-1|bc)"
+export DEB_BUILD_OPTIONS="parallel=$NUM_CPU"
 export TZ="/usr/share/zoneinfo/Etc/GMT-14"
 export LANG="fr_CH.UTF-8"
 export LC_ALL="fr_CH.UTF-8"

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