output all failures in totest manager

openSUSE · Sep 8, 2014 · 8dfc26f · 8dfc26f
1 parent ca0f664
commit 8dfc26f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/osc-totest.py b/osc-totest.py
@@ -103,11 +103,12 @@ def tt_overall_result(self, snapshot):
         'opensuse-FTT-GNOME-Live-x86_64-Build-gnome-live@USBboot_64', # broken in 20140828
     ]
 
-    if len(jobs) < 80: # not yet scheduled
+    if len(jobs) < 90: # not yet scheduled
         print "we have only", len(jobs), "jobs"
         return QAResult.InProgress
 
     number_of_fails = 0
+    in_progress = False
     for job in jobs:
         #print json.dumps(job, sort_keys=True, indent=4)
         if job['result'] == 'failed' or job['result'] == 'incomplete' :
@@ -125,13 +126,16 @@ def tt_overall_result(self, snapshot):
         elif job['result'] == 'passed':
             continue
         elif job['result'] == 'none':
-            return QAResult.InProgress
+            in_progress = True
         else:
             raise Exception(job['result'])
 
     if number_of_fails > 0:
         return QAResult.Failed
 
+    if in_progress:
+        return QAResult.InProgress
+
     if known_failures:
         print "Some are now passing", known_failures
     return QAResult.Passed

diff --git a/osclib/cleanup_rings.py b/osclib/cleanup_rings.py
@@ -81,7 +81,7 @@ def check_depinfo_ring(self, prj, nextprj):
         self.find_inner_ring_links(prj)
         self.fill_pkgdeps(prj, 'standard', 'x86_64')
 
-        if prj == 'openSUSE:{}:Rings:1-MinimalX':
+        if prj == 'openSUSE:{}:Rings:1-MinimalX'.format(self.api.opensuse):
             url = makeurl(self.api.apiurl, ['build', prj, 'images', 'x86_64', 'Test-DVD-x86_64', '_buildinfo'])
             root = ET.parse(http_GET(url)).getroot()
             for bdep in root.findall('bdep'):