[Qa-jenkins-scm] [jenkins.debian.net] 02/02: reproducible: create arch specific schedule pages

[Holger Levsen]

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 80fc4399dfa031355c68b8feae75c364dc1ebfe8
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Sep 10 20:35:13 2015 +0200

    reproducible: create arch specific schedule pages
---
 bin/reproducible_common.py       |  2 +-
 bin/reproducible_common.sh       |  2 ++
 bin/reproducible_html_indexes.py | 22 +++++++++++-----------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py
index 91e4ec1..6c6484e 100755
--- a/bin/reproducible_common.py
+++ b/bin/reproducible_common.py
@@ -184,7 +184,7 @@ html_head_page = Template((tab*2).join("""
     <li><a href="/index_issues.html">issues</a></li>
     <li><a href="/$suite/$arch/index_notes.html">packages with notes</a></li>
     <li><a href="/$suite/$arch/index_no_notes.html">packages without notes</a></li>
-    <li><a href="/index_scheduled.html">currently scheduled</a></li>
+    <li><a href="/index_$arch_scheduled.html">currently scheduled</a></li>
 $links
     <li><a href="/index_repositories.html">repositories overview</a></li>
     <li><a href="/reproducible.html">reproducible stats</a></li>
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 0cc587d..9fe6c70 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -232,6 +232,8 @@ write_page_header() {
 				fi
 				write_page "<li><a href=\"/$i/index_suite_${ARCH}_stats.html\">suite: $i</a></li>"
 			done
+		elif [ "$TARGET" = "scheduled" ] ; then
+			write_page "<li><a href=\"/index_${ARCH}_scheduled.html\">${SPOKEN_TARGET}</a></li>"
 		elif [ "$TARGET" = "notify" ] ; then
 			write_page "<li><a href=\"$BASEURL/index_${TARGET}.html\" title=\"notify icon\">${SPOKEN_TARGET}</a></li>"
 		elif [ "$TARGET" = "arch" ] ; then
diff --git a/bin/reproducible_html_indexes.py b/bin/reproducible_html_indexes.py
index 29e514d..5eabe47 100755
--- a/bin/reproducible_html_indexes.py
+++ b/bin/reproducible_html_indexes.py
@@ -535,17 +535,17 @@ def build_page(page, suite=None, arch=None):
     log.info('"' + title + '" now available at ' + desturl)
 
 
-def generate_schedule():
-    """ the schedule is very different than others index pages """
-    log.info('Building the schedule index page...')
-    title = 'Packages currently scheduled for testing for build reproducibility'
+def generate_schedule(arch):
+    """ the schedule pages are very different than others index pages """
+    log.info('Building the schedule index page for ' + arch +'...')
+    title = 'Packages currently scheduled on {arch} for testing for build reproducibility'
     query = 'SELECT sch.date_scheduled, s.suite, s.architecture, s.name ' + \
             'FROM schedule AS sch JOIN sources AS s ON sch.package_id=s.id ' + \
-            'WHERE sch.date_build_started = "" ORDER BY sch.date_scheduled'
-    text = Template('$tot packages are currently scheduled for testing:')
+            'WHERE sch.date_build_started = "" AND s.architecture="{arch}" ORDER BY sch.date_scheduled'
+    text = Template('$tot packages are currently scheduled for testing on $arch:')
     html = ''
-    rows = query_db(query)
-    html += build_leading_text_section({'text': text}, rows, defaultsuite, defaultarch)
+    rows = query_db(query.format(arch=arch))
+    html += build_leading_text_section({'text': text}, rows, defaultsuite, arch)
     html += '<p><table class="scheduled">\n' + tab
     html += '<tr><th>#</th><th>scheduled at</th><th>suite</th>'
     html += '<th>architecture</th><th>source package</th></tr>\n'
@@ -558,16 +558,16 @@ def generate_schedule():
         html += link_package(pkg, row[1], row[2], bugs)
         html += '</code></td></tr>\n'
     html += '</table></p>\n'
-    destfile = BASE + '/index_scheduled.html'
-    desturl = REPRODUCIBLE_URL + '/index_scheduled.html'
+    destfile = BASE + '/index_' + arch + '_scheduled.html'
+    desturl = REPRODUCIBLE_URL + '/index_' + arch + '_scheduled.html'
     write_html_page(title=title, body=html, destfile=destfile, style_note=True)
 
 
 bugs = get_bugs()
 
 if __name__ == '__main__':
-    generate_schedule()
     for arch in ARCHS:
+        generate_schedule(arch)
         for suite in SUITES:
             if arch == 'armhf' and suite != 'unstable':
                 continue

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