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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit c5269c043c0d3442b7a09fcfee86ee908211f694
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Feb 26 09:06:59 2015 +0100

    setup ssh stuff for dput
---
 kci/builder.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/kci/builder.rb b/kci/builder.rb
index 2746070..7c9bcd5 100755
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -32,6 +32,7 @@ require_relative 'lib/debian/changelog'
 ENV['HOME'] = '/var/lib/jenkins'
 ENV['PATH'] = '/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin'
 ENV['GNUPGHOME'] = '/var/lib/jenkins/tooling/gnupg'
+DPUTCONF = '/var/lib/jenkins/tooling/dput.cf'
 KEYID = 'AB3CE70E'
 
 Project = Struct.new(:series, :stability, :name)
@@ -154,7 +155,12 @@ Dir.chdir('build/source/') do
     # We try to dput two times in a row giving it first 30 minutes and then
     # 15 minutes to complete. If it didn't manage to upload after that we
     # ignore the package and move on.
-    dput = "dput #{PPA} ../#{changelog.name}_#{changelog.version(Changelog::BASE | Changelog::BASESUFFIX)}*.changes"
+    `cp -rf /var/lib/jenkins/.ssh /root/`
+    `chown -Rv root:root /root/.ssh`
+    if `ssh-keygen -F ppa.launchpad.net`.strip.empty?
+      `ssh-keyscan -H ppa.launchpad.net >> ~/.ssh/known_hosts`
+    end
+    dput = "dput -c #{DPUTCONF} #{PPA} ../#{changelog.name}_#{changelog.version(Changelog::BASE | Changelog::BASESUFFIX)}*.changes"
     success = false
     4.times do |count|
         # Note: count starts at 0 ;)

-- 
ci-tooling packaging