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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 39985e1a3a4812ec26f07c58c4417fcc1f91da42
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Feb 25 11:53:22 2015 +0100

    sync ppa-wait from live
---
 kci/ppa-wait.py | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/kci/ppa-wait.py b/kci/ppa-wait.py
index 32304cb..220b22f 100755
--- a/kci/ppa-wait.py
+++ b/kci/ppa-wait.py
@@ -26,10 +26,10 @@ import shutil
 import socket
 
 # Because buffering delays output to exit Oo
-#sys.stdout = sys.stderr
+sys.stdout = sys.stderr
 
-#lp = Launchpad.login_with("kubuntu-dev-tools", "production", credentials_file='/var/lib/jenkins/tooling/cred')
-lp = Launchpad.login_with("kubuntu-dev-tools", "production", version="devel")
+lp = Launchpad.login_with("kubuntu-dev-tools", "production", credentials_file='/var/lib/jenkins/tooling/cred')
+#lp = Launchpad.login_with("kubuntu-dev-tools", "production", version="devel")
 
 def getPPAObject(owner, PPA):
     return lp.people[owner].getPPAByName(name=PPA)
@@ -88,12 +88,13 @@ def get_logs(source):
         f.write(archindep)
     print("logs done.")
 
-ppa = getPPAObject("kubuntu-ci", "unstable")
-
-print "------------------------- Waiting for LP Builds -------------------------"
-
 pkg_name = sys.argv[1]
 pkg_version = sys.argv[2]
+ppa_name = sys.argv[3]
+
+ppa = getPPAObject("kubuntu-ci", ppa_name)
+
+print "------------------------- Waiting for LP Builds -------------------------"
 
 def getSource():
     fail_count = 0
@@ -108,9 +109,9 @@ def getSource():
             fail_count += 1
 
 # If it takes 20 minutes for the source to arrive it probably got rejected
-fail_count = 20 # This is minutes
+fail_count = 40 # This is minutes
 while True:
-    source = None 
+    source = None
     try:
         # This will raise on index access if we have no sources yet.
         source = getSource()
@@ -132,12 +133,7 @@ while True:
                 sleep = 60
             continue
         if state == 'Chroot problem' or state == 'Failed to upload':
-            print "retry"
-            needs_wait = True
-            build.retry()
-            if sleep < 60 * 5:
-                sleep = 60 * 5
-            continue
+            has_failed = True
         if state == 'Failed to build' or state == 'Build for superseded Source' or state == 'Cancelled build' or state == 'Dependency wait':
             has_failed = True
     if has_failed:
@@ -182,3 +178,4 @@ get_logs(source)
 
 print("PPA Wait done.")
 sys.exit(0)
+

-- 
ci-tooling packaging