[Git][qa/jenkins.debian.net][master] fixup: tests.r-b.o/debian: ignore i386 when cross-checking db and fs for breakage

[Holger Levsen (@holger)]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
e368c4cc by Holger Levsen at 2025-05-25T23:52:34+02:00
fixup: tests.r-b.o/debian: ignore i386 when cross-checking db and fs for breakage

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- bin/reproducible_html_breakages.py


Changes:

=====================================
bin/reproducible_html_breakages.py
=====================================
@@ -39,8 +39,8 @@ def unrep_with_dbd_issues():
     sources_without_dbd = set()
     query = '''SELECT s.name, r.version, s.suite, s.architecture
                FROM sources AS s JOIN results AS r ON r.package_id=s.id
-               WHERE r.status='FTBR'
-               AND NOT s.architecture='i386'
+               WHERE r.status = 'FTBR'
+               AND s.architecture != 'i386'
                AND s.distribution = (SELECT id FROM distributions WHERE name = 'debian')
                AND s.suite NOT IN :as
                ORDER BY s.name ASC, s.suite DESC, s.architecture ASC'''
@@ -80,7 +80,7 @@ def not_unrep_with_dbd_file():
     query = '''SELECT s.name, r.version, s.suite, s.architecture
                FROM sources AS s JOIN results AS r ON r.package_id=s.id
                WHERE r.status != 'FTBR'
-               AND NOT s.architecture='i386'
+               AND s.architecture != 'i386'
                AND s.distribution = (SELECT id FROM distributions WHERE name = 'debian')
                AND s.suite NOT IN :as
                ORDER BY s.name ASC, s.suite DESC, s.architecture ASC'''
@@ -111,7 +111,7 @@ def lack_rbuild():
                JOIN results AS r ON r.package_id=s.id
                FULL OUTER JOIN schedule AS sch ON sch.package_id=s.id
                WHERE r.status NOT IN ('blacklisted', '')
-               AND NOT s.architecture='i386'
+               AND s.architecture != 'i386'
                AND s.distribution = (SELECT id FROM distributions WHERE name = 'debian')
                AND s.suite NOT IN :as
                AND NOT EXISTS (SELECT 1 FROM schedule AS sch WHERE sch.date_build_started IS NOT NULL and sch.package_id=s.id)
@@ -137,7 +137,7 @@ def lack_buildinfo():
                FULL OUTER JOIN schedule AS sch ON sch.package_id=s.id
                WHERE r.status NOT IN
                 ('blacklisted', 'NFU', 'FTBFS', 'timeout', 'depwait', 'E404')
-               AND NOT s.architecture='i386'
+               AND s.architecture != 'i386'
                AND s.distribution = (SELECT id FROM distributions WHERE name = 'debian')
                AND s.suite NOT IN :as
                AND NOT EXISTS (SELECT 1 FROM schedule AS sch WHERE sch.date_build_started IS NOT NULL and sch.package_id=s.id)
@@ -164,8 +164,8 @@ def alien_log(directory=None):
     query = '''SELECT r.version
                FROM sources AS s JOIN results AS r ON r.package_id=s.id
                WHERE r.status != '' AND s.name='{pkg}' AND s.suite='{suite}'
-               AND NOT s.architecture='i386'
-               AND s.architecture='{arch}'
+               AND s.architecture = '{arch}'
+               AND s.architecture != 'i386'
                ORDER BY s.name ASC, s.suite DESC, s.architecture ASC'''
     bad_files = []
     for root, dirs, files in os.walk(directory):
@@ -215,8 +215,8 @@ def alien_buildinfo():
     query = '''SELECT r.version
                FROM sources AS s JOIN results AS r ON r.package_id=s.id
                WHERE r.status != '' AND s.name='{pkg}' AND s.suite='{suite}'
-               AND s.architecture='{arch}'
-               AND NOT s.architecture='i386'
+               AND s.architecture = '{arch}'
+               AND s.architecture != 'i386'
                AND r.status IN ('reproducible', 'FTBR')
                ORDER BY s.name ASC, s.suite DESC, s.architecture ASC'''
     bad_files = []
@@ -265,8 +265,8 @@ def alien_rbpkg():
     query = '''SELECT s.name
                FROM sources AS s
                WHERE s.name='{pkg}' AND s.suite='{suite}'
-               AND s.architecture='{arch}'
-               AND NOT s.architecture='i386'
+               AND s.architecture = '{arch}'
+               AND s.architecture != 'i386'
                ORDER BY s.name ASC, s.suite DESC, s.architecture ASC'''
     bad_files = []
     for root, dirs, files in os.walk(RB_PKG_PATH):
@@ -361,7 +361,7 @@ def update_stats_breakages(diffoscope_timeouts, diffoscope_crashes):
             SELECT datum, diffoscope_timeouts, diffoscope_crashes
             FROM stats_breakages
             WHERE datum = '{date}'
-            AND NOT s.architecture='i386'
+            AND s.architecture != 'i386'
         """.format(date=YESTERDAY))
 
     # if there is not a result for this day, add one



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/e368c4cc69b594eb66320c8e5ac2e10025f7b0e7
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/20250525/30afe2ac/attachment-0001.htm>