[Qa-jenkins-scm] [jenkins.debian.net] 02/03: reproducible: revert the logic, actually on armhf we cannot guarantee to have a different number of cores…

[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 dfa15e63fd98ec47f1d545f4bc7aaf2b8fa76a20
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Jan 4 16:22:51 2016 +0100

    reproducible: revert the logic, actually on armhf we cannot guarantee to have a different number of cores…
---
 bin/reproducible_build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index daffb38..d5939c3 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -581,10 +581,10 @@ second_build() {
 	echo "============================================================================="
 	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
+	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=$NUM_CPU
+		NEW_NUM_CPU=$(echo $NUM_CPU-1|bc)
 	fi
 	cat > "$TMPCFG" << EOF
 BUILDUSERID=2222

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