[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: do not reinvent nproc, thanks to Andreas Beckmann for the hint

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
ba2c9f6b by Holger Levsen at 2018-10-15T14:47:11Z
do not reinvent nproc, thanks to Andreas Beckmann for the hint

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
9eeb3a85 by Holger Levsen at 2018-10-15T14:52:41Z
d-i tests: use --debbuildopts "-J$NUM_CPU" as its considered safer than -j

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


4 changed files:

- bin/d-i_build.sh
- bin/d-i_manual.sh
- bin/reproducible_common.sh
- bin/reproducible_info.sh


Changes:

=====================================
bin/d-i_build.sh
=====================================
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012-2016 Holger Levsen <holger at layer-acht.org>
+# Copyright 2012-2018 Holger Levsen <holger at layer-acht.org>
 # 		 2016 Phil Hands <phil at hands.com>
 # released under the GPLv=2
 
@@ -128,7 +128,7 @@ pdebuild_package() {
 	# build (binary packages only, as sometimes we cannot get the upstream tarball...)
 	#
 	SOURCE=$(dpkg-parsechangelog |grep ^Source: | cut -d " " -f2)
-	NUM_CPU=$(grep -c '^processor' /proc/cpuinfo)
+	NUM_CPU=$(nproc)
 	#
 	# if we got a valid TRIGGERING_BRANCH passed in as a parameter from the triggering job
 	# then grab the generated udebs.  FIXME -- we need to work out a way of cleaning up old branches
@@ -136,7 +136,7 @@ pdebuild_package() {
 	if udeb_dir=$(replace_origin_pu "/srv/udebs/" $TRIGGERING_BRANCH) ; then
 		cp $udeb_dir/*.udeb build/localudebs
 	fi
-	pdebuild --use-pdebuild-internal --debbuildopts "-j$NUM_CPU -b" --buildresult ${RESULT_DIR} -- --http-proxy $http_proxy
+	pdebuild --use-pdebuild-internal --debbuildopts "-J$NUM_CPU -b" --buildresult ${RESULT_DIR} -- --http-proxy $http_proxy
 	# cleanup
 	echo
 	cat ${RESULT_DIR}/${SOURCE}_*changes


=====================================
bin/d-i_manual.sh
=====================================
@@ -1,7 +1,7 @@
 #!/bin/bash
 # vim: set noexpandtab:
 
-# Copyright 2012,2014 Holger Levsen <holger at layer-acht.org>
+# Copyright 2012-2018 Holger Levsen <holger at layer-acht.org>
 #           © 2018 Mattia Rizzolo <mattia at debian.org>
 # released under the GPLv=2
 
@@ -48,8 +48,8 @@ pdebuild_package() {
 	# build
 	#
 	cd manual
-	NUM_CPU=$(grep -c '^processor' /proc/cpuinfo)
-	pdebuild --use-pdebuild-internal --debbuildopts "-j$NUM_CPU" -- --http-proxy $http_proxy
+	NUM_CPU=$(nproc)
+	pdebuild --use-pdebuild-internal --debbuildopts "-J$NUM_CPU" -- --http-proxy $http_proxy
 	#
 	# publish and cleanup
 	#


=====================================
bin/reproducible_common.sh
=====================================
@@ -66,7 +66,7 @@ RPM_BUILD_NODE=profitbricks-build3-amd64
 RPM_PKGS=/srv/reproducible-results/rpm_pkgs
 
 # number of cores to be used
-NUM_CPU=$(grep -c '^processor' /proc/cpuinfo)
+NUM_CPU=$(nproc)
 
 # diffoscope memory limit in kilobytes
 DIFFOSCOPE_VIRT_LIMIT=$((10*1024*1024))


=====================================
bin/reproducible_info.sh
=====================================
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2015-2016 Holger Levsen <holger at layer-acht.org>
+# Copyright 2015-2018 Holger Levsen <holger at layer-acht.org>
 # released under the GPLv=2
 
 DEBUG=false
@@ -10,7 +10,7 @@ set -e
 
 # these variables also need to be in bin/reproducible_common.sh where they define $BUILD_ENV_VARS (see right below)
 ARCH=$(dpkg --print-architecture)
-NUM_CPU=$(grep -c '^processor' /proc/cpuinfo)
+NUM_CPU=$(nproc)
 CPU_MODEL=$(cat /proc/cpuinfo |grep "model name"|head -1|cut -d ":" -f2|xargs echo)
 DATETIME=$(date +'%Y-%m-%d %H:%M %Z')
 KERNEL=$(uname -smrv)



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/4a03120497d88c78485bce6640c398cd59e36bfa...9eeb3a85d0deae0ad3848ef1d8c85f8006a9cda2

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/4a03120497d88c78485bce6640c398cd59e36bfa...9eeb3a85d0deae0ad3848ef1d8c85f8006a9cda2
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/20181015/a40a0a36/attachment-0001.html>