[Git][qa/jenkins.debian.net][master] t.r-b.o/d: continue WIP, add sql statements and graph colors for forky
Holger Levsen (@holger)
gitlab at salsa.debian.org
Wed Aug 13 14:22:43 BST 2025
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
8958a791 by Holger Levsen at 2025-08-13T15:22:33+02:00
t.r-b.o/d: continue WIP, add sql statements and graph colors for forky
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
4 changed files:
- TODO.forky
- TODO.trixie
- bin/make_graph.py
- bin/reproducible_common.sh
Changes:
=====================================
TODO.forky
=====================================
@@ -31,7 +31,7 @@ this is the stuff which needs to be done when forky has been released.
** run the maintenance jobs (to create the chdist)
** once the above jobs are successful, restart the builders
** adopt whatever suite specific hacks _create_meta_pkg_sets.sh has
-** tweak reproducible_common.sh in three locations to start collect statistics on the daily builds for duke too (and make_graph.py too: (in lines 40 and 54++)
+** tweak reproducible_common.sh in three locations to start collect statistics on the daily builds for duke too (and make_graph.py too: (in lines 43++ and 58++)
** create reproducible_(cdeboot|deboot|mmdeb)strap jobs for duke and drop bookworm ones
** create reproducible_debian_live_build jobs for duke and drop bookworm ones
** add reproducible_debian_live_build.*duke to reproducible_html_nodes_info.sh
=====================================
TODO.trixie
=====================================
@@ -3,11 +3,6 @@
* on jenkins and ionos7 once we are sure they run fine: pg_dropcluster 15 main
* things to do when bookworm been released and trixie is open for development:
-** pause building: touch `NO-RB-BUILDERS-PLEASE`, shutdown build at service, reproducible_cleanup_nodes.sh and place jenkins in quiet-down.
-** restart jenkins, run the trixie pbuilder and chroot jobs
-** run the maintenance jobs (to create the chdist)
-** once the above jobs are successful, restarts the builders
-** tweak reproducible_common.sh in three locations to start collect statistics on the daily builds for trixie too (and make_graph.py too: (in lines 40 and 54++)
** create reproducible_(cdeboot|deboot|mmdeb)strap jobs for trixie
** create reproducible_debian_live_build jobs for trixie
** add reproducible_debian_live_build.*trixie to reproducible_html_nodes_info.sh
=====================================
bin/make_graph.py
=====================================
@@ -39,12 +39,12 @@ def main():
elif int(colors) == 99:
# each row represents one state: reproducible, FTBR, FTBFS, other
# each column represents one suite:
- # stretch buster bullseye bookworm trixie unstable experimental
- colors='28' # ADJUST THIS NUMBER TOO: 28 = 8 releases * 4 states
- r('palette(c("#4e9a06", "#57a231", "#73d216", "#8ae234", "#9af244", "#acff65", "#afff85", \
- "#ce5c00", "#d56900", "#f57900", "#fcaf3e", "#fc9a27", "#fdba37", "#facea2", \
- "#930000", "#a40000", "#cc0000", "#e21100", "#fc2a00", "#fd1a1a", "#ff0a2a", \
- "#222222", "#333333", "#444444", "#555555", "#666666", "#777777", "#888888" ))')
+ # stretch buster bullseye bookworm trixie forky unstable experimental
+ colors='32' # ADJUST THIS NUMBER TOO: 32 = 8 releases * 4 states
+ r('palette(c("#4e9a06", "#57a231", "#73d216", "#8ae234", "#9af244", "#acff65", "#c5ff88", "#afff85", \
+ "#ce5c00", "#d56900", "#f57900", "#fcaf3e", "#fc9a27", "#fdba37", "#ffff37", "#facea2", \
+ "#930000", "#a40000", "#cc0000", "#e21100", "#fc2a00", "#fd4a00", "#fd2a00", "#ff0a00", \
+ "#222222", "#333333", "#444444", "#555555", "#666666", "#777777", "#888888", "#999999" ))')
elif int(colors) == 101:
r('palette(c("#4e9a06", "#000000"))') # stretch
elif int(colors) == 102:
@@ -55,8 +55,10 @@ def main():
r('palette(c("#8ae234", "#000000"))') # bookworm
elif int(colors) == 105:
r('palette(c("#9af244", "#000000"))') # trixie
+ elif int(colors) == 106:
+ r('palette(c("#acff65", "#000000"))') # forky
elif int(colors) == 200:
- r('palette(c("#acff65", "#000000"))') # unstable
+ r('palette(c("#c5ff88", "#000000"))') # unstable
elif int(colors) == 300:
r('palette(c("#afff95", "#000000"))') # experimental
else:
=====================================
bin/reproducible_common.sh
=====================================
@@ -868,6 +868,7 @@ create_debian_png_from_table() {
COALESCE(reproducible_bullseye,0) AS reproducible_bullseye,
COALESCE(reproducible_bookworm,0) AS reproducible_bookworm,
COALESCE(reproducible_trixie,0) AS reproducible_trixie,
+ COALESCE(reproducible_forky,0) AS reproducible_forky,
COALESCE(reproducible_unstable,0) AS reproducible_unstable,
COALESCE(reproducible_experimental,0) AS reproducible_experimental,
COALESCE(FTBR_stretch,0) AS FTBR_stretch,
@@ -875,6 +876,7 @@ create_debian_png_from_table() {
COALESCE(FTBR_bullseye,0) AS FTBR_bullseye,
COALESCE(FTBR_bookworm,0) AS FTBR_bookworm,
COALESCE(FTBR_trixie,0) AS FTBR_trixie,
+ COALESCE(FTBR_forky,0) AS FTBR_forky,
COALESCE(FTBR_unstable,0) AS FTBR_unstable,
COALESCE(FTBR_experimental,0) AS FTBR_experimental,
COALESCE(FTBFS_stretch,0) AS FTBFS_stretch,
@@ -882,6 +884,7 @@ create_debian_png_from_table() {
COALESCE(FTBFS_bullseye,0) AS FTBFS_bullseye,
COALESCE(FTBFS_bookworm,0) AS FTBFS_bookworm,
COALESCE(FTBFS_trixie,0) AS FTBFS_trixie,
+ COALESCE(FTBFS_forky,0) AS FTBFS_forky,
COALESCE(FTBFS_unstable,0) AS FTBFS_unstable,
COALESCE(FTBFS_experimental,0) AS FTBFS_experimental,
COALESCE(other_stretch,0) AS other_stretch,
@@ -889,6 +892,7 @@ create_debian_png_from_table() {
COALESCE(other_bullseye,0) AS other_bullseye,
COALESCE(other_bookworm,0) AS other_bookworm,
COALESCE(other_trixie,0) AS other_trixie,
+ COALESCE(other_forky,0) AS other_forky,
COALESCE(other_unstable,0) AS other_unstable,
COALESCE(other_experimental,0) AS other_experimental
FROM (SELECT s.datum,
@@ -897,6 +901,7 @@ create_debian_png_from_table() {
COALESCE((SELECT e.reproducible FROM stats_builds_per_day AS e WHERE s.datum=e.datum AND suite='bullseye' $WHERE_EXTRA),0) AS reproducible_bullseye,
COALESCE((SELECT e.reproducible FROM stats_builds_per_day AS e WHERE s.datum=e.datum AND suite='bookworm' $WHERE_EXTRA),0) AS reproducible_bookworm,
COALESCE((SELECT e.reproducible FROM stats_builds_per_day AS e WHERE s.datum=e.datum AND suite='trixie' $WHERE_EXTRA),0) AS reproducible_trixie,
+ COALESCE((SELECT e.reproducible FROM stats_builds_per_day AS e WHERE s.datum=e.datum AND suite='forky' $WHERE_EXTRA),0) AS reproducible_forky,
COALESCE((SELECT e.reproducible FROM stats_builds_per_day AS e WHERE s.datum=e.datum AND suite='unstable' $WHERE_EXTRA),0) AS reproducible_unstable,
COALESCE((SELECT e.reproducible FROM stats_builds_per_day AS e WHERE s.datum=e.datum AND suite='experimental' $WHERE_EXTRA),0) AS reproducible_experimental,
(SELECT e.FTBR FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='stretch' $WHERE_EXTRA) AS FTBR_stretch,
@@ -904,6 +909,7 @@ create_debian_png_from_table() {
(SELECT e.FTBR FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='bullseye' $WHERE_EXTRA) AS FTBR_bullseye,
(SELECT e.FTBR FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='bookworm' $WHERE_EXTRA) AS FTBR_bookworm,
(SELECT e.FTBR FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='trixie' $WHERE_EXTRA) AS FTBR_trixie,
+ (SELECT e.FTBR FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='forky' $WHERE_EXTRA) AS FTBR_forky,
(SELECT e.FTBR FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='unstable' $WHERE_EXTRA) AS FTBR_unstable,
(SELECT e.FTBR FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='experimental' $WHERE_EXTRA) AS FTBR_experimental,
(SELECT e.FTBFS FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='stretch' $WHERE_EXTRA) AS FTBFS_stretch,
@@ -911,6 +917,7 @@ create_debian_png_from_table() {
(SELECT e.FTBFS FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='bullseye' $WHERE_EXTRA) AS FTBFS_bullseye,
(SELECT e.FTBFS FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='bookworm' $WHERE_EXTRA) AS FTBFS_bookworm,
(SELECT e.FTBFS FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='trixie' $WHERE_EXTRA) AS FTBFS_trixie,
+ (SELECT e.FTBFS FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='forky' $WHERE_EXTRA) AS FTBFS_forky,
(SELECT e.FTBFS FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='unstable' $WHERE_EXTRA) AS FTBFS_unstable,
(SELECT e.FTBFS FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='experimental' $WHERE_EXTRA) AS FTBFS_experimental,
(SELECT e.other FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='stretch' $WHERE_EXTRA) AS other_stretch,
@@ -918,6 +925,7 @@ create_debian_png_from_table() {
(SELECT e.other FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='bullseye' $WHERE_EXTRA) AS other_bullseye,
(SELECT e.other FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='bookworm' $WHERE_EXTRA) AS other_bookworm,
(SELECT e.other FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='trixie' $WHERE_EXTRA) AS other_trixie,
+ (SELECT e.other FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='forky' $WHERE_EXTRA) AS other_forky,
(SELECT e.other FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='unstable' $WHERE_EXTRA) AS other_unstable,
(SELECT e.other FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='experimental' $WHERE_EXTRA) AS other_experimental
FROM stats_builds_per_day AS s $WHERE2_EXTRA GROUP BY s.datum) as stats
@@ -943,7 +951,8 @@ create_debian_png_from_table() {
buster) COLORS=102 ;;
bullseye) COLORS=103 ;;
bookworm) COLORS=104 ;;
- trixie) COLORS=105 ;; # adding another suite after this one also needs changes in make_graph.py around line 64
+ trixie) COLORS=105 ;;
+ forky) COLORS=106 ;; # adding another suite after this one also needs 2 changes in make_graph.py around lines 43 & 57
unstable) COLORS=200 ;;
experimental) COLORS=300 ;;
esac
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/8958a791dda88e2b5a5cbe60abbfe2c3703bb633
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/8958a791dda88e2b5a5cbe60abbfe2c3703bb633
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/20250813/aac0e71e/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list