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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit f68cd81ac95c0f71ea8fd321f22c0a418308e203
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Mar 16 10:52:18 2015 +0100

    thread wiping and force a sleep when copying
    
    I am still seeing job races in my inbox, less than with threading but it
    still appears that for almost every daily promotion there is one race
---
 kci/ppa_promote.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kci/ppa_promote.rb b/kci/ppa_promote.rb
index f272753..57817c5 100755
--- a/kci/ppa_promote.rb
+++ b/kci/ppa_promote.rb
@@ -15,6 +15,8 @@ require_relative 'lib/retry'
 # by one we instead do that by limiting our thread pool.
 # https://bugs.launchpad.net/launchpad/+bug/1314569
 THREAD_COUNT = 1
+# Wiping is unaffected as far as we can tell.
+WIPE_THREAD_COUNT = 8
 
 # TODO: wait for wipe and publish to be done. fail if publish takes >40 minutes
 
@@ -42,7 +44,7 @@ class Archive
                                          distro_series: @series)
       source_queue = Queue.new
       sources.each { |s| source_queue << s }
-      BlockingThreadPool.run(THREAD_COUNT) do
+      BlockingThreadPool.run(WIPE_THREAD_COUNT) do
         until source_queue.empty?
           source = source_queue.pop(true)
           next if source.status == 'Deleted'
@@ -72,6 +74,7 @@ class Archive
                             version: version,
                             to_pocket: 'Release',
                             include_binaries: true)
+          sleep 1 # Force sleep to avoid a race in launchpad, see THREAD_COUNT.
         end
       end
     end

-- 
ci-tooling packaging