[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible Debian: fix syntax

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net


Commits:
528f3bce by Mattia Rizzolo at 2019-12-02T18:23:53Z
reproducible Debian: fix syntax

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
954a9a7f by Mattia Rizzolo at 2019-12-02T18:30:59Z
reproducible Debian: try to quickly fix a TypeError

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


2 changed files:

- bin/reproducible_html_live_status.py
- bin/reproducible_scheduler.py


Changes:

=====================================
bin/reproducible_html_live_status.py
=====================================
@@ -88,7 +88,7 @@ def generate_schedule(arch):
         pkg = row[3]
         duration = convert_into_hms_string(row[5])
         avg_duration = convert_into_hms_string(row[6])
-        html += tab + '<tr><td> </td><td>' + row[0] + '</td>'
+        html += tab + '<tr><td> </td><td>' + str(row[0]) + '</td>'
         html += '<td>' + row[1] + '</td><td>' + row[2] + '</td><td><code>'
         html += Package(pkg).html_link(row[1], row[2])
         html += '</code></td><td>'+convert_into_status_html(str(row[4]))+'</td><td>'+duration+'</td><td>' + avg_duration + '</td></tr>\n'
@@ -196,7 +196,7 @@ def generate_oldies(arch):
             html += tab + '<tr><td> </td><td>' + row[0] + '</td>'
             html += '<td>' + row[1] + '</td><td><code>'
             html += Package(pkg).html_link(row[0], row[1])
-            html += '</code></td><td>'+convert_into_status_html(str(row[3]))+'</td><td>' + row[4] + '</td></tr>\n'
+            html += '</code></td><td>'+convert_into_status_html(str(row[3]))+'</td><td>' + str(row[4]) + '</td></tr>\n'
         html += '</table></p>\n'
     destfile = DISTRO_BASE + '/index_' + arch + '_oldies.html'
     desturl = DISTRO_URL + '/index_' + arch + '_oldies.html'


=====================================
bin/reproducible_scheduler.py
=====================================
@@ -467,7 +467,7 @@ def query_untested_packages(suite, arch, limit):
                     SELECT sources.id, sources.name FROM sources
                     WHERE sources.suite='{suite}' AND sources.architecture='{arch}'
                     AND sources.id NOT IN
-                       (SELECT schedule.package_id FROM schedule AND build_type='ci_build')
+                       (SELECT schedule.package_id FROM schedule WHERE build_type='ci_build')
                     AND sources.id NOT IN
                        (SELECT results.package_id FROM results)
                     ORDER BY random()



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/70e1568b8f2cec495b89c14267837761728dbf15...954a9a7f864827f9489151fa92557d28dd4c6e8d

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/70e1568b8f2cec495b89c14267837761728dbf15...954a9a7f864827f9489151fa92557d28dd4c6e8d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20191202/232fa0b2/attachment-0001.html>