summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/reproducible_html_live_status.py17
1 files changed, 8 insertions, 9 deletions
diff --git a/bin/reproducible_html_live_status.py b/bin/reproducible_html_live_status.py
index 18ff9705..3c9dd63a 100755
--- a/bin/reproducible_html_live_status.py
+++ b/bin/reproducible_html_live_status.py
@@ -41,7 +41,7 @@ def generate_schedule(arch):
def generate_live_status_table(arch):
- query = 'SELECT s.id, s.name, s.version, s.suite, s.architecture, ' + \
+ query = 'SELECT s.id, s.suite, s.architecture, s.name, s.version, ' + \
'p.scheduler, 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 ' + \
@@ -50,8 +50,8 @@ def generate_live_status_table(arch):
html = ''
rows = query_db(query.format(arch=arch))
html += '<p><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>'
+ html += '<tr><th>#</th><th>src pkg id</th><th>suite</th><th>arch</th>'
+ html += '<th>name</th><th>version</th></th><th>scheduled by</th>'
html += '<th>build started</th><th>previous build status</th>'
html += '<th>version building</th><th>previous build duration</th><th>builder job</th><th>notify</th>'
html += '</tr>\n'
@@ -61,13 +61,12 @@ def generate_live_status_table(arch):
# the numbers 16 and 7 should really be derived from /var/lib/jenkins/jobs/reproducible_builder_${arch}_* instead of being hard-coded here...
if ( arch == 'amd64' and counter == 16 ) or ( arch == 'armhf' and counter == 7 ):
html += '<tr><td colspan="13">There are more builds marked as currently building in the database than there are ' + arch + ' build jobs. This does not compute. Please cleanup and please automate cleanup.</td></tr>'
- pkg = row[1]
- arch = row[4]
- suite = row[3]
+ suite = row[1]
+ arch = row[2]
+ pkg = row[3]
html += tab + '<tr><td>&nbsp;</td><td>' + str(row[0]) + '</td>'
- html += '<td><code>'
- html += link_package(pkg, suite, arch)
- html += '</code></td><td>' + str(row[2]) + '</td><td>' + str(row[3]) + '</td>'
+ html += '<td>' + suite + '</td><td>' + arch + '</td>'
+ html += '<td><code>' + link_package(pkg, suite, arch) + '</code></td>'
html += '<td>' + str(row[4]) + '</td><td>' + str(row[5]) + '</td><td>' + str(row[6]) + '</td>'
html += '<td>' + str(row[7]) + '</td><td>' + str(row[8]) + '</td><td>' + str(row[9]) + '</td>'
html += '<td><a href="https://jenkins.debian.net/job/reproducible_builder_' + str(row[10]) + '/console">' + str(row[10]) + '</a></td><td>' + str(row[11]) + '</td>'