[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible debian: define a "archived_suites" configuration
Mattia Rizzolo (@mattia)
gitlab at salsa.debian.org
Wed Apr 26 13:00:46 BST 2023
Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net
Commits:
dadd1a38 by Mattia Rizzolo at 2023-04-26T13:59:58+02:00
reproducible debian: define a "archived_suites" configuration
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
66df6f97 by Mattia Rizzolo at 2023-04-26T14:00:17+02:00
reproducible debian: breakages: do not check for the files of archived suites
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
5 changed files:
- bin/rblib/const.py
- bin/reproducible.ini
- bin/reproducible_common.sh
- bin/reproducible_html_breakages.py
- bin/reproducible_html_dashboard.sh
Changes:
=====================================
bin/rblib/const.py
=====================================
@@ -19,6 +19,7 @@ from .confparse import (
# tested suites
SUITES = conf_distro['suites'].split()
+ARCHIVED_SUITES = conf_distro.get('archived_suites', '').split()
# tested architectures
ARCHS = conf_distro['archs'].split()
# defaults
=====================================
bin/reproducible.ini
=====================================
@@ -25,6 +25,7 @@ buildinfo = buildinfo
distro_root = debian
landing_page = reproducible.html
suites = unstable bookworm bullseye buster experimental
+archived_suites = stretch
archs = amd64 arm64 armhf i386
defaultsuite = unstable
defaultarch = amd64
=====================================
bin/reproducible_common.sh
=====================================
@@ -35,7 +35,7 @@ mkdir -p "$CHPATH"
# Debian suites being tested
SUITES="unstable bookworm bullseye buster experimental"
-DISABLED_SUITES="stretch"
+ARCHIVED_SUITES="stretch"
# Debian architectures being tested
ARCHS="amd64 arm64 armhf i386"
=====================================
bin/reproducible_html_breakages.py
=====================================
@@ -1,7 +1,7 @@
#!/usr/bin/python3
# -*- coding: utf-8 -*-
#
-# Copyright © 2015-2019 Mattia Rizzolo <mattia at mapreri.org>
+# Copyright © 2015-2023 Mattia Rizzolo <mattia at mapreri.org>
# Copyright © 2016-2018 Holger Levsen <holger at layer-acht.org>
#
# Licensed under GPL-2
@@ -25,6 +25,7 @@ from rblib.utils import bcolors, create_temp_file, strip_epoch
from rblib.const import (
BIN_PATH,
DISTRO_BASE, DISTRO_URL,
+ ARCHIVED_SUITES,
HISTORY_PATH, RB_PKG_PATH, DBD_PATH, DBDTXT_PATH, DBDJSON_PATH,
BUILDINFO_PATH, LOGS_PATH, DIFFS_PATH, RBUILD_PATH,
)
@@ -39,8 +40,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)
ORDER BY s.name ASC, s.suite DESC, s.architecture ASC'''
- results = query_db(query)
+ results = query_db(query, (ARCHIVED_SUITES,))
for pkg, version, suite, arch in results:
eversion = strip_epoch(version)
dbd = DBD_PATH + '/' + suite + '/' + arch + '/' + pkg + '_' + \
@@ -77,8 +79,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)
ORDER BY s.name ASC, s.suite DESC, s.architecture ASC'''
- results = query_db(query)
+ results = query_db(query, (ARCHIVED_SUITES,))
for pkg, version, suite, arch in results:
eversion = strip_epoch(version)
for prefix, extension in ((
@@ -103,8 +106,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)
ORDER BY s.name ASC, s.suite DESC, s.architecture ASC'''
- results = query_db(query)
+ results = query_db(query, (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))
@@ -123,8 +127,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)
ORDER BY s.name ASC, s.suite DESC, s.architecture ASC'''
- results = query_db(query)
+ results = query_db(query, (ARCHIVED_SUITES,))
for pkg, version, suite, arch in results:
eversion = strip_epoch(version)
buildinfo = BUILDINFO_PATH + '/' + suite + '/' + arch + '/' + pkg + \
=====================================
bin/reproducible_html_dashboard.sh
=====================================
@@ -27,8 +27,8 @@ COMMA_VAR=""
FIELDS[0]="datum, reproducible, FTBR, FTBFS, other, untested"
FIELDS[1]="datum"
for i in reproducible FTBR FTBFS other ; do
- # $DISABLED_SUITES are needed as we still collect stats in create_debian_png_from_table() as part of wider stats
- for j in $SUITES $DISABLED_SUITES ; do
+ # $ARCHIVED_SUITES are needed as we still collect stats in create_debian_png_from_table() as part of wider stats
+ for j in $SUITES $ARCHIVED_SUITES ; do
FIELDS[1]="${FIELDS[1]}, ${i}_${j}"
done
done
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/e0f2120c0bd46d2c90b60f278e6f63a04603cec6...66df6f97098063a41a4f1479ce2425928265957a
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/e0f2120c0bd46d2c90b60f278e6f63a04603cec6...66df6f97098063a41a4f1479ce2425928265957a
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/20230426/b9f20003/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list