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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit c852084dbfa45dc0fd4facb88ebad1d619a4f752
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Feb 24 17:21:02 2015 +0100

    fix up jenkins checking in current live daily qa script
    
    previous fail logic was a bit dodgy, should be better now also logging weeh
---
 kci/daily-qa.rb | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/kci/daily-qa.rb b/kci/daily-qa.rb
index ce55a72..7c4c84f 100755
--- a/kci/daily-qa.rb
+++ b/kci/daily-qa.rb
@@ -24,7 +24,7 @@ job_names = jenkins.job.list("^#{project.series}_#{project.stability}_.*")
 
 job_name_queue = Queue.new
 job_names.each do |name|
-    job_name_queue << name
+  job_name_queue << name
 end
 
 # Check status of the jobs through a very simply threaded queue.
@@ -33,28 +33,29 @@ end
 # outside localhost.
 threads = []
 16.times do
-    threads << Thread.new do
-        jenkins = new_jenkins
-        while name = job_name_queue.pop(true) do
-            begin
-                if jenkins.job.status(name) != 'success' \
-                        or jenkins.job.status(name) != 'unstable' \
-                        or jenkins.queue.list.include?(name)
-                    $logger.error "#{name} does not qualify for snapshot. Aborting."
-                    exit 1
-                end
-            rescue
-                retry
-            end
+  threads << Thread.new do
+    jenkins = new_jenkins
+    while name = job_name_queue.pop(true) do
+      begin
+        status = jenkins.job.status(name)
+        in_queue = jenkins.queue.list.include?(name)
+        $logger.info "#{name} :: #{status} :: #{in_queue}"
+        if (status != 'success' && status != 'unstable') || in_queue
+          $logger.error "#{name} does not qualify for snapshot. Aborting."
+          exit 1
         end
+      rescue
+        retry
+      end
     end
+  end
 end
 
 ThreadsWait.all_waits(threads)
 
 $logger.info "All Jenkins jobs seem jolly alright"
 
-Launchpad::authenticate
+Launchpad.authenticate
 
 class CiPPA
     attr_reader :type

-- 
ci-tooling packaging