[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible Debian: some more trivial updates for bookworm being the new testing
Holger Levsen (@holger)
gitlab at salsa.debian.org
Tue Aug 17 11:13:50 BST 2021
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
e5eb75ad by Holger Levsen at 2021-08-17T11:59:51+02:00
reproducible Debian: some more trivial updates for bookworm being the new testing
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
1c5b2efa by Holger Levsen at 2021-08-17T12:13:34+02:00
reproducible Debian: start scheduling tests for bookworm
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
9 changed files:
- TODO
- bin/reproducible.ini
- bin/reproducible_blacklist.sh
- bin/reproducible_build.sh
- bin/reproducible_common.sh
- bin/reproducible_maintenance.sh
- bin/reproducible_notes.py
- bin/reproducible_scheduler.py
- bin/reproducible_setup_pbuilder.sh
Changes:
=====================================
TODO
=====================================
@@ -28,6 +28,13 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
* salsa stuff:
** triggers for d-i repos are missing
+=== bookworm development
+
+* upgrade remaining hosts to bullseye
+* rb_scheulder.py: stop scheduling ftbfs+depwait for buster
+* rb_scheulder.py: start scheduling old for bookworm, stop old for bullseye (once evertything has been build after 2021-08-17)
+* graphs & dashboard for bookworm
+
=== nodes at OSUOSL
* add to README
=====================================
bin/reproducible.ini
=====================================
@@ -24,7 +24,7 @@ buildinfo = buildinfo
[debian]
distro_root = debian
landing_page = reproducible.html
-suites = stretch buster bullseye unstable experimental
+suites = stretch buster bullseye bookworm unstable experimental
archs = amd64 i386 arm64 armhf
defaultsuite = unstable
defaultarch = amd64
=====================================
bin/reproducible_blacklist.sh
=====================================
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2014-2017 Holger Levsen <holger at layer-acht.org>
+# Copyright 2014-2021 Holger Levsen <holger at layer-acht.org>
# © 2015 Mattia Rizzolo <mattia at mapreri.org>
# released under the GPLv2
@@ -74,7 +74,7 @@ case $SUITE in
sid) echo "WARNING: sid has been renamed to unstable."
SUITE=unstable
;;
- stretch|buster|bullseye|unstable|experimental) ;;
+ stretch|buster|bullseye|bookworm|unstable|experimental) ;;
*) echo "$SUITE is not a valid suite".
explain_syntax
exit 1
=====================================
bin/reproducible_build.sh
=====================================
@@ -735,7 +735,7 @@ EOF
local pbuilder_options=()
case "${SUITE}" in
- stretch|buster) ;;
+ stretch|buster|bullseye) ;;
*) pbuilder_options+=(--extrapackages usrmerge)
;;
esac
=====================================
bin/reproducible_common.sh
=====================================
@@ -506,7 +506,7 @@ write_variation_table() {
write_page "<tr><td>uid</td><td>uid=1111</td><td>uid=2222</td></tr>"
write_page "<tr><td>gid</td><td>gid=1111</td><td>gid=2222</td></tr>"
write_page "<tr><td>/bin/sh</td><td>/bin/dash</td><td>/bin/bash</td></tr>"
- write_page "<tr><td><em><a href=\"https://wiki.debian.org/UsrMerge\">usrmerge</a></em> package installed</td><td>no</td><td>yes <em>(not varied for stretch/buster)</em></td></tr>"
+ write_page "<tr><td><em><a href=\"https://wiki.debian.org/UsrMerge\">usrmerge</a></em> package installed</td><td>no</td><td>yes <em>(not varied for stretch/buster/bullseye)</em></td></tr>"
write_page "<tr><td>build path</td><td>/build/1st/\$pkg-\$ver <em>(Only varied for unstable/experimental)</em></td><td>/build/2/\$pkg-\$ver/2nd <em>(Only varied for unstable/experimental)</em></td></tr>"
write_page "<tr><td>user's login shell</td><td>/bin/sh</td><td>/bin/bash</td></tr>"
write_page "<tr><td>user's <a href="https://en.wikipedia.org/wiki/Gecos_field">GECOS</a></td><td>first user,first room,first work-phone,first home-phone,first other</td><td>second user,second room,second work-phone,second home-phone,second other</td></tr>"
=====================================
bin/reproducible_maintenance.sh
=====================================
@@ -725,7 +725,7 @@ echo "$(date -u) - Checking for files with bad permissions."
# automatically fix rbuild files with wrong permissions...
# (we know it happens (very rarely) but... shrugs.)
[ ! -d $DEBIAN_BASE/rbuild ] || find $DEBIAN_BASE/rbuild ! -perm 644 -type f -exec chmod -v 644 {} \; 2>/dev/null|| true
-BADPERMS=$(find $DEBIAN_BASE/{buildinfo,dbd,artifacts,stretch,buster,bullseye,unstable,experimental,rb-pkg} ! -perm 644 -type f 2>/dev/null|| true)
+BADPERMS=$(find $DEBIAN_BASE/{buildinfo,dbd,artifacts,stretch,buster,bullseye,bookworm,unstable,experimental,rb-pkg} ! -perm 644 -type f 2>/dev/null|| true)
if [ ! -z "$BADPERMS" ] ; then
DIRTY=true
echo
=====================================
bin/reproducible_notes.py
=====================================
@@ -32,7 +32,7 @@ def load_notes():
{ 'package_name': [
{'suite': 'unstable', 'version': '0.0', 'comments': None,
'bugs': [1234, 5678], 'issues': ['blalba','auauau']},
- {'suite': 'buster', 'version': None, 'comments': 'strstr',
+ {'suite': 'bullseye', 'version': None, 'comments': 'strstr',
'bugs': [], 'issues': []}],
'package_name':<etc> }
"""
=====================================
bin/reproducible_scheduler.py
=====================================
@@ -76,6 +76,7 @@ LIMITS = {
'stretch': {'*': 255},
'buster': {'*': 255},
'bullseye': {'*': 255},
+ 'bookworm': {'*': 255},
'unstable': {'*': 255},
'experimental': {'*': 255},
},
@@ -83,6 +84,7 @@ LIMITS = {
'stretch': {'*': 255},
'buster': {'*': 255},
'bullseye': {'*': 255},
+ 'bookworm': {'*': 255},
'unstable': {'*': 255},
'experimental': {'*': 255},
},
@@ -90,6 +92,7 @@ LIMITS = {
'stretch': {'*': 255},
'buster': {'*': 255},
'bullseye': {'*': 255},
+ 'bookworm': {'*': 255},
'unstable': {'*': 255},
'experimental': {'*': 255},
},
@@ -97,6 +100,7 @@ LIMITS = {
'stretch': {'*': 255},
'buster': {'*': 255},
'bullseye': {'*': 255},
+ 'bookworm': {'*': 255},
'unstable': {'*': 255},
'experimental': {'*': 255},
},
@@ -106,6 +110,7 @@ LIMITS = {
'stretch': {1: (1000, 500), 2: (1500, 750), '*': 100},
'buster': {1: (1000, 500), 2: (1500, 650), '*': 100},
'bullseye': {1: (1000, 500), 2: (1500, 750), '*': 150},
+ 'bookworm': {1: (1000, 500), 2: (1500, 750), '*': 150},
'unstable': {1: (1000, 500), 2: (1500, 750), '*': 250},
'experimental': {1: (1000, 500), 2: (1500, 750), '*': 50},
},
@@ -113,6 +118,7 @@ LIMITS = {
'stretch': {1: (800, 500), 2: (1300, 750), '*': 100},
'buster': {1: (800, 500), 2: (1300, 650), '*': 100},
'bullseye': {1: (1000, 500), 2: (1500, 750), '*': 150},
+ 'bookworm': {1: (1000, 500), 2: (1500, 750), '*': 150},
'unstable': {1: (800, 500), 2: (1300, 750), '*': 250},
'experimental': {1: (800, 500), 2: (1300, 750), '*': 50},
},
@@ -120,6 +126,7 @@ LIMITS = {
'stretch': {1: (1000, 500), 2: (1500, 750), '*': 50},
'buster': {1: (1000, 500), 2: (1500, 650), '*': 50},
'bullseye': {1: (1000, 500), 2: (1500, 750), '*': 150},
+ 'bookworm': {1: (1000, 500), 2: (1500, 750), '*': 150},
'unstable': {1: (1000, 500), 2: (1500, 750), '*': 125},
'experimental': {1: (1000, 500), 2: (1500, 750), '*': 25},
},
@@ -127,6 +134,7 @@ LIMITS = {
'stretch': {1: (900, 200), 2: (1400, 350), '*': 50},
'buster': {1: (900, 300), 2: (1400, 450), '*': 50},
'bullseye': {1: (900, 400), 2: (1400, 600), '*': 75},
+ 'bookworm': {1: (900, 400), 2: (1400, 600), '*': 75},
'unstable': {1: (900, 450), 2: (1400, 650), '*': 150},
'experimental': {1: (900, 400), 2: (1400, 600), '*': 25},
},
@@ -134,28 +142,32 @@ LIMITS = {
'ftbfs': {
'amd64': {
'stretch': {1: (1000, 0), 2: (1500, 0), '*': 0},
- 'buster': {1: (1000, 0), 2: (1500, 0), '*': 5},
- 'bullseye': {1: (1000, 40), 2: (1500, 20), '*': 5},
+ 'buster': {1: (1000, 0), 2: (1500, 0), '*': 2},
+ 'bullseye': {1: (1000, 20), 2: (1500, 10), '*': 5},
+ 'bookworm': {1: (1000, 40), 2: (1500, 20), '*': 5},
'unstable': {1: (1000, 40), 2: (1500, 20), '*': 5},
'experimental': {1: (1000, 40), 2: (1500, 20), '*': 2},
},
'i386': {
'stretch': {1: (1000, 0), 2: (1300, 0), '*': 0},
- 'buster': {1: (1000, 0), 2: (1300, 0), '*': 5},
- 'bullseye': {1: (1000, 40), 2: (1300, 20), '*': 5},
+ 'buster': {1: (1000, 0), 2: (1300, 0), '*': 2},
+ 'bullseye': {1: (1000, 20), 2: (1300, 10), '*': 5},
+ 'bookworm': {1: (1000, 40), 2: (1300, 20), '*': 5},
'unstable': {1: (1000, 40), 2: (1300, 20), '*': 5},
'experimental': {1: (1000, 40), 2: (1300, 20), '*': 2},
},
'arm64': {
'stretch': {1: (1000, 0), 2: (1500, 0), '*': 0},
- 'buster': {1: (1000, 0), 2: (1500, 0), '*': 5},
- 'bullseye': {1: (1000, 40), 2: (1500, 20), '*': 5},
+ 'buster': {1: (1000, 0), 2: (1500, 0), '*': 2},
+ 'bullseye': {1: (1000, 20), 2: (1500, 10), '*': 5},
+ 'bookworm': {1: (1000, 40), 2: (1500, 20), '*': 5},
'unstable': {1: (1000, 40), 2: (1500, 20), '*': 5},
'experimental': {1: (1000, 40), 2: (1500, 20), '*': 2},
},
'armhf': {
'stretch': {1: (900, 0), 2: (1400, 0), '*': 0},
- 'buster': {1: (900, 0), 2: (1400, 0), '*': 5},
+ 'buster': {1: (900, 0), 2: (1400, 0), '*': 2},
+ 'bullseye': {1: (900, 10), 2: (1400, 5), '*': 5},
'bullseye': {1: (900, 20), 2: (1400, 10), '*': 5},
'unstable': {1: (900, 20), 2: (1400, 10), '*': 5},
'experimental': {1: (900, 20), 2: (1400, 10), '*': 2},
@@ -165,28 +177,32 @@ LIMITS = {
'amd64': {
'stretch': {1: (1000, 0), 2: (1500, 0), '*': 0},
'buster': {1: (1000, 0), 2: (1500, 0), '*': 50},
- 'bullseye': {1: (1000, 400), 2: (1500, 200), '*': 50},
+ 'bullseye': {1: (1000, 200), 2: (1500, 100), '*': 50},
+ 'bookworm': {1: (1000, 400), 2: (1500, 200), '*': 50},
'unstable': {1: (1000, 400), 2: (1500, 200), '*': 50},
'experimental': {1: (1000, 400), 2: (1500, 200), '*': 20},
},
'i386': {
'stretch': {1: (800, 0), 2: (1300, 0), '*': 0},
'buster': {1: (800, 0), 2: (1300, 0), '*': 50},
- 'bullseye': {1: (800, 400), 2: (1300, 200), '*': 50},
+ 'bullseye': {1: (800, 200), 2: (1300, 100), '*': 50},
+ 'bookworm': {1: (800, 400), 2: (1300, 200), '*': 50},
'unstable': {1: (800, 400), 2: (1300, 200), '*': 50},
'experimental': {1: (800, 400), 2: (1300, 200), '*': 20},
},
'arm64': {
'stretch': {1: (1000, 0), 2: (1500, 0), '*': 0},
'buster': {1: (1000, 0), 2: (1500, 0), '*': 50},
- 'bullseye': {1: (1000, 400), 2: (1500, 200), '*': 50},
+ 'bullseye': {1: (1000, 200), 2: (1500, 100), '*': 50},
+ 'bookworm': {1: (1000, 400), 2: (1500, 200), '*': 50},
'unstable': {1: (1000, 400), 2: (1500, 200), '*': 50},
'experimental': {1: (1000, 400), 2: (1500, 200), '*': 20},
},
'armhf': {
'stretch': {1: (900, 0), 2: (1400, 0), '*': 0},
'buster': {1: (900, 0), 2: (1400, 0), '*': 50},
- 'bullseye': {1: (900, 200), 2: (1400, 100), '*': 50},
+ 'bullseye': {1: (900, 100), 2: (1400, 50), '*': 50},
+ 'bookworm': {1: (900, 200), 2: (1400, 100), '*': 50},
'unstable': {1: (900, 200), 2: (1400, 100), '*': 50},
'experimental': {1: (900, 200), 2: (1400, 100), '*': 20},
}
@@ -196,6 +212,7 @@ LIMITS = {
'stretch': {1: (1000, 0), 2: (1500, 0), '*': 0},
'buster': {1: (1000, 0), 2: (1500, 0), '*': 0},
'bullseye': {1: (1000, 1000), 2: (1500, 850), '*': 0},
+ 'bookworm': {1: (1000, 0), 2: (1500, 0), '*': 0},
'unstable': {1: (1000, 1350), 2: (1500, 1150), '*': 0},
'experimental': {1: (1000, 70), 2: (1500, 50), '*': 0},
},
@@ -203,6 +220,7 @@ LIMITS = {
'stretch': {1: (800, 0), 2: (1300, 0), '*': 0},
'buster': {1: (800, 0), 2: (1300, 0), '*': 0},
'bullseye': {1: (800, 700), 2: (1300, 550), '*': 0},
+ 'bookworm': {1: (1000, 0), 2: (1500, 0), '*': 0},
'unstable': {1: (800, 1100), 2: (1300, 950), '*': 0},
'experimental': {1: (800, 70), 2: (1300, 50), '*': 0},
},
@@ -210,6 +228,7 @@ LIMITS = {
'stretch': {1: (1000, 0), 2: (1500, 0), '*': 0},
'buster': {1: (1000, 0), 2: (1500, 0), '*': 0},
'bullseye': {1: (1000, 900), 2: (1500, 750), '*': 0},
+ 'bookworm': {1: (1000, 0), 2: (1500, 0), '*': 0},
'unstable': {1: (1000, 1300), 2: (1500, 1100), '*': 0},
'experimental': {1: (1000, 70), 2: (1500, 50), '*': 0},
},
@@ -217,6 +236,7 @@ LIMITS = {
'stretch': {1: (900, 0), 2: (1400, 0), '*': 0},
'buster': {1: (900, 0), 2: (1400, 0), '*': 0},
'bullseye': {1: (900, 900), 2: (1400, 600), '*': 0},
+ 'bookworm': {1: (1000, 0), 2: (1500, 0), '*': 0},
'unstable': {1: (900, 1200), 2: (1400, 800), '*': 0},
'experimental': {1: (900, 70), 2: (1400, 50), '*': 0},
}
=====================================
bin/reproducible_setup_pbuilder.sh
=====================================
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set noexpandtab:
-# Copyright 2014-2019 Holger Levsen <holger at layer-acht.org>
+# Copyright 2014-2021 Holger Levsen <holger at layer-acht.org>
# © 2018 Mattia Rizzolo <mattia at debian.org>
# released under the GPLv2
@@ -139,7 +139,7 @@ setup_pbuilder() {
sudo pbuilder --execute $pbuilder_http_proxy --save-after-exec --basetgz /var/cache/pbuilder/${NAME}-new.tgz -- ${TMPFILE} | tee ${LOG}
rm ${TMPFILE}
- # add repo only for experimental and unstable - keep stretch/buster "real" (and sid progressive!)
+ # add repo only for experimental and unstable - keep stretch/buster/bullseye "real" (and sid progressive!)
if [ "$SUITE" = "unstable" ] || [ "$SUITE" = "experimental" ]; then
# apply further customisations, eg. install $PACKAGES from our repo
create_setup_our_repo_tmpfile ${TMPFILE} "${PACKAGES}"
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/7cdc13c80691ce912b1f3816b580bfb9f5a79a6c...1c5b2efa6a9f75a7d52b889e785b873d6b802919
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/7cdc13c80691ce912b1f3816b580bfb9f5a79a6c...1c5b2efa6a9f75a7d52b889e785b873d6b802919
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/20210817/fa642efd/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list