[Qa-jenkins-scm] [jenkins.debian.net] 03/05: reproducible: make generate_live_status() arch aware

Holger Levsen holger at moszumanska.debian.org
Thu Sep 10 23:28:42 UTC 2015


This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit b312278bc5a8b764f66f40307d83e7b4e31ef3b9
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Sep 11 01:13:39 2015 +0200

    reproducible: make generate_live_status() arch aware
---
 bin/reproducible_html_live_status.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/reproducible_html_live_status.py b/bin/reproducible_html_live_status.py
index 98bf3b2..8d6ea07 100755
--- a/bin/reproducible_html_live_status.py
+++ b/bin/reproducible_html_live_status.py
@@ -39,7 +39,7 @@ def generate_schedule(arch):
     log.info("Page generated at " + desturl)
 
 
-def generate_live_status():
+def generate_live_status(arch):
     """ the schedule pages are very different than others index pages """
     log.info('Building live status page...')
     title = 'Live status of reproducible.debian.net'
@@ -47,10 +47,10 @@ def generate_live_status():
             'p.scheduler, p.date_scheduled, p.date_build_started, ' + \
             'r.status, r.version, r.build_duration, p.builder, p.notify ' + \
             'FROM sources AS s JOIN schedule AS p ON p.package_id=s.id LEFT JOIN results AS r ON s.id=r.package_id ' + \
-            'WHERE p.date_build_started != "" OR p.notify != "" ' + \
+            'WHERE (p.date_build_started != "" OR p.notify != "") AND s.architecture="{arch}" ' + \
             'ORDER BY p.date_build_started DESC'
     html = ''
-    rows = query_db(query)
+    rows = query_db(query.format(arch=arch))
     html += '<p>If there are more than 21 rows shown here, the list includes stale builds... we\'re working on it. Stay tuned.<table class="scheduled">\n' + tab
     html += '<tr><th>#</th><th>src pkg id</th><th>name</th><th>version</th>'
     html += '<th>suite</th><th>arch</th><th>scheduled by</th>'
@@ -76,7 +76,7 @@ def generate_live_status():
     log.info("Page generated at " + desturl)
 
 if __name__ == '__main__':
-    generate_live_status()
+    generate_live_status("*")
     for arch in ARCHS:
         generate_schedule(arch)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git



More information about the Qa-jenkins-scm mailing list