[SCM] ci-tooling packaging branch, master, updated. 82bfc0de19307d166c46b4cdf4414d9c2cc8f9d8

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=82bfc0d

The following commit has been merged in the master branch:
commit 82bfc0de19307d166c46b4cdf4414d9c2cc8f9d8
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Jan 12 12:14:37 2016 +0100

    make test pass on trusty LTS
---
 lib/ci/build_binary.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/ci/build_binary.rb b/lib/ci/build_binary.rb
index af8c674..8bd8d1a 100644
--- a/lib/ci/build_binary.rb
+++ b/lib/ci/build_binary.rb
@@ -1,6 +1,7 @@
 require 'fileutils'
 
 require_relative 'source'
+require_relative '../lsb'
 require_relative '../retry'
 
 module CI
@@ -30,7 +31,10 @@ module CI
     end
 
     def build_package
-      dpkg_buildopts = %w(-us -uc -sa -jauto)
+      dpkg_buildopts = %w(-us -uc -sa)
+      # Automatically decide how many concurrent build jobs we can support.
+      # NOTE: special cased for trusty master servers to pass
+      dpkg_buildopts << '-jauto' unless LSB::DISTRIB_CODENAME == 'trusty'
 
       # Only build arch independent packages on AMD64
       dpkg_buildopts << '-B' unless RbConfig::CONFIG['host_cpu'] == 'x86_64'

-- 
ci-tooling packaging