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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 143c63c88059dd41940cfc7aaa959735c4fa3eb3
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Mar 31 12:59:03 2015 +0200

    force chown in builder to workaround docker being meh
---
 kci/builder.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/kci/builder.rb b/kci/builder.rb
index 396570b..bbc7fe6 100755
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -57,6 +57,16 @@ fail 'Could not change dir to ARGV1' unless Dir.chdir(ARGV[1])
 
 WORKSPACE_PATH = ARGV[1]
 
+# Workaround for docker not having suidmaps. We run as root in the docker
+# which will result in uid/gid of written things to be 0 rather than whatever
+# jenkins has. So instead we have a fake jenkins user in the docker we can
+# chmod to. This ultimately ensures that the owernship is using the uid of
+# the host jenkins (equal to docker jenkins) such that we don't end up with
+# stuff owned by others.
+at_exit do
+  FileUtils.chown_R('jenkins', 'jenkins', WORKSPACE_PATH, verbose: true)
+end
+
 # install deps
 `apt-get install -y xz-utils dpkg-dev ruby dput debhelper pkg-kde-tools devscripts python-launchpadlib ubuntu-dev-tools git`
 

-- 
ci-tooling packaging