From: Loic Dachary <ldachary@redhat.com>
Date: Fri, 20 Nov 2015 12:46:28 +0000 (+0100)
Subject: buildpackages: do not -jX on dumpling
X-Git-Tag: v10.2.6~165^2^2~276^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f398b71e339b4617db180c8140f23d004f445a24;p=ceph.git

buildpackages: do not -jX on dumpling

http://tracker.ceph.com/issues/13845 Refs: #13845

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/tasks/buildpackages/common.sh b/tasks/buildpackages/common.sh
index ef8252c1f693..1085bc08ab5c 100644
--- a/tasks/buildpackages/common.sh
+++ b/tasks/buildpackages/common.sh
@@ -123,8 +123,28 @@ function test_link_same() {
     rm -fr $d
 }
 
+function maybe_parallel() {
+    local nproc=$1
+    local vers=$2
+
+    if echo $vers | grep --quiet '0\.67' ; then
+        return
+    fi
+
+    if test $nproc -gt 1 ; then
+        echo -j${nproc}
+    fi
+}
+
+function test_maybe_parallel() {
+    test "$(maybe_parallel 1 0.72)" = "" || return 1
+    test "$(maybe_parallel 8 0.67)" = "" || return 1
+    test "$(maybe_parallel 8 0.72)" = "-j8" || return 1
+}
+
 if test "$1" = "TEST" ; then
     shopt -s -o xtrace
     PS4='${BASH_SOURCE[0]}:$LINENO: ${FUNCNAME[0]}:  '
     test_link_same
+    test_maybe_parallel
 fi
diff --git a/tasks/buildpackages/make-deb.sh b/tasks/buildpackages/make-deb.sh
index 7d67ee575f45..a20307e40205 100755
--- a/tasks/buildpackages/make-deb.sh
+++ b/tasks/buildpackages/make-deb.sh
@@ -102,14 +102,9 @@ function build_package() {
         DEBEMAIL="contact@ceph.com" dch -D $codename --force-distribution -b -v "$dvers" "new version"
     fi
     #
-    # create the packages
-    # a) with ccache to speed things up when building repeatedly
-    # b) do not sign the packages
-    # c) use half of the available processors
+    # create the packages (with ccache)
     #
-    if test $NPROC -gt 1 ; then
-        j=-j${NPROC}
-    fi
+    j=$(maybe_parallel $NPROC $vers)
     PATH=/usr/lib/ccache:$PATH dpkg-buildpackage $j -uc -us
 }
 
diff --git a/tasks/buildpackages/make-rpm.sh b/tasks/buildpackages/make-rpm.sh
index 34edb6bab3a3..754b0a430e35 100755
--- a/tasks/buildpackages/make-rpm.sh
+++ b/tasks/buildpackages/make-rpm.sh
@@ -47,7 +47,6 @@ releasedir=$base/$(lsb_release -si)/WORKDIR
 # d) contains the short hash of the commit
 #
 vers=$(git describe --long --match "v*" | sed s/^v//)
-: ${NPROC:=$(nproc)}
 ceph_dir=$(pwd)
 
 #