[Qa-jenkins-scm] [jenkins.debian.net] 01/05: d-i_build: remove workaround for console-setup now that the relevant bug is fixed

[Mattia Rizzolo]

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

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

commit 3316474eecfe86e0500a35572127c9ed2bf9a774
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sat Apr 7 21:08:44 2018 +0200

    d-i_build: remove workaround for console-setup now that the relevant bug is fixed
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 TODO             | 1 -
 bin/d-i_build.sh | 7 +------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/TODO b/TODO
index df4e855..4e124ae 100644
--- a/TODO
+++ b/TODO
@@ -81,7 +81,6 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
 
 === To be done once bugs are fixed
 
-* link:https://bugs.debian.org/767260[#767260] workaround in bin/d-i_build.sh (console-setup doesn't support parallel build)
 * link:https://bugs.debian.org/767032[#767032] manual fix in etc/munin/plugins/munin_stats
 * link:https://bugs.debian.org/767100[#767100] work in progress in etc/munin/plugins/cpu
 * link:https://bugs.debian.org/767018[#767018] work in progress in etc/munin/plugins/iostat_ios
diff --git a/bin/d-i_build.sh b/bin/d-i_build.sh
index 3d0ac57..b317a51 100755
--- a/bin/d-i_build.sh
+++ b/bin/d-i_build.sh
@@ -126,12 +126,7 @@ pdebuild_package() {
 	# build (binary packages only, as sometimes we cannot get the upstream tarball...)
 	#
 	SOURCE=$(dpkg-parsechangelog |grep ^Source: | cut -d " " -f2)
-	# workaround #767260 (console-setup doesn't support parallel build)
-	if [ "$SOURCE" != "console-setup" ] ; then
-		NUM_CPU=$(grep -c '^processor' /proc/cpuinfo)
-	else
-		NUM_CPU=1
-	fi
+	NUM_CPU=$(grep -c '^processor' /proc/cpuinfo)
 	#
 	# 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

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