[Git][qa/jenkins.debian.net][master] reproducible debian: fix html_brekages

[Mattia Rizzolo (@mattia)]

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


Commits:
ae1bb04f by Mattia Rizzolo at 2023-11-08T17:25:05+02:00
reproducible debian: fix html_brekages

obviously I was sleeping when I wrote the original version...

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

- - - - -


2 changed files:

- bin/rblib/const.py
- bin/reproducible_html_breakages.py


Changes:

=====================================
bin/rblib/const.py
=====================================
@@ -19,7 +19,7 @@ from .confparse import (
 
 # tested suites
 SUITES = conf_distro['suites'].split()
-ARCHIVED_SUITES = conf_distro.get('archived_suites', '').split()
+ARCHIVED_SUITES = tuple(conf_distro.get('archived_suites', '').split())
 # tested architectures
 ARCHS = conf_distro['archs'].split()
 # defaults


=====================================
bin/reproducible_html_breakages.py
=====================================
@@ -14,6 +14,7 @@ import os
 import csv
 import time
 import os.path
+from sqlalchemy import text
 from subprocess import check_call
 from datetime import datetime, timedelta
 
@@ -40,9 +41,9 @@ def unrep_with_dbd_issues():
                FROM sources AS s JOIN results AS r ON r.package_id=s.id
                WHERE r.status='FTBR'
                AND s.distribution = (SELECT id FROM distributions WHERE name = 'debian')
-               AND s.suite NOT IN (%s)
+               AND s.suite NOT IN :as
                ORDER BY s.name ASC, s.suite DESC, s.architecture ASC'''
-    results = query_db(query, (ARCHIVED_SUITES,))
+    results = query_db(text(query), {'as': ARCHIVED_SUITES})
     for pkg, version, suite, arch in results:
         eversion = strip_epoch(version)
         dbd = DBD_PATH + '/' + suite + '/' + arch + '/' + pkg + '_' + \
@@ -79,9 +80,9 @@ def not_unrep_with_dbd_file():
                FROM sources AS s JOIN results AS r ON r.package_id=s.id
                WHERE r.status != 'FTBR'
                AND s.distribution = (SELECT id FROM distributions WHERE name = 'debian')
-               AND s.suite NOT IN (%s)
+               AND s.suite NOT IN :as
                ORDER BY s.name ASC, s.suite DESC, s.architecture ASC'''
-    results = query_db(query, (ARCHIVED_SUITES,))
+    results = query_db(text(query), {'as': ARCHIVED_SUITES})
     for pkg, version, suite, arch in results:
         eversion = strip_epoch(version)
         for prefix, extension in ((
@@ -106,9 +107,9 @@ def lack_rbuild():
                FROM sources AS s JOIN results AS r ON r.package_id=s.id
                WHERE r.status NOT IN ('blacklisted', '')
                AND s.distribution = (SELECT id FROM distributions WHERE name = 'debian')
-               AND s.suite NOT IN (%s)
+               AND s.suite NOT IN :as
                ORDER BY s.name ASC, s.suite DESC, s.architecture ASC'''
-    results = query_db(query, (ARCHIVED_SUITES,))
+    results = query_db(text(query), {'as': ARCHIVED_SUITES})
     for pkg, version, suite, arch in results:
         rbuild = os.path.join(RBUILD_PATH, suite, arch) + \
                 '/{}_{}.rbuild.log.gz'.format(pkg, strip_epoch(version))
@@ -127,9 +128,9 @@ def lack_buildinfo():
                WHERE r.status NOT IN
                 ('blacklisted', 'NFU', 'FTBFS', 'timeout', 'depwait', 'E404')
                AND s.distribution = (SELECT id FROM distributions WHERE name = 'debian')
-               AND s.suite NOT IN (%s)
+               AND s.suite NOT IN :as
                ORDER BY s.name ASC, s.suite DESC, s.architecture ASC'''
-    results = query_db(query, (ARCHIVED_SUITES,))
+    results = query_db(text(query), {'as': ARCHIVED_SUITES})
     for pkg, version, suite, arch in results:
         eversion = strip_epoch(version)
         buildinfo = BUILDINFO_PATH + '/' + suite + '/' + arch + '/' + pkg + \



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/ae1bb04fe6f994cfc6e7d4b377a24513f4ea56c8

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/ae1bb04fe6f994cfc6e7d4b377a24513f4ea56c8
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/20231108/0f5b83d7/attachment-0001.htm>