[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible Debian: adjust create-meta-pkgs for trixie cloud images
Holger Levsen (@holger)
gitlab at salsa.debian.org
Mon Jun 12 13:31:11 BST 2023
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
5646422a by Holger Levsen at 2023-06-12T14:23:03+02:00
reproducible Debian: adjust create-meta-pkgs for trixie cloud images
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
b9801380 by Holger Levsen at 2023-06-12T14:30:44+02:00
reproducible Debian: collect stats for trixie
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
4 changed files:
- TODO
- bin/make_graph.py
- bin/reproducible_common.sh
- bin/reproducible_create_meta_pkg_sets.sh
Changes:
=====================================
TODO
=====================================
@@ -34,11 +34,12 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
** 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
+** adopt whatever suite specific hacks _create_meta_pkg_sets.sh has
+** tweak reproducible_common.sh to start collect statistics on the daily builds for trixie too
=== 2023 things
* things still to be done after the bookworm release and as trixie is open for development
-** tweak reproducible_common.sh to start collect statistics on the daily builds for trixie too
** tweak as needed for to properly graphs the just collected statistics
** adjust chroot jobs
** adjust orphaned/multiarch jobs
=====================================
bin/make_graph.py
=====================================
@@ -60,6 +60,8 @@ def main():
r('palette(c("#9cf345", "#000000"))')
elif int(colors) == 45:
r('palette(c("#acff85", "#000000"))')
+ elif int(colors) == 46:
+ r('palette(c("#cfff95", "#000000"))')
# "revert the hack" (it's still a hack :)
if int(colors) >= 40:
colors='1'
=====================================
bin/reproducible_common.sh
=====================================
@@ -887,24 +887,28 @@ create_debian_png_from_table() {
COALESCE(reproducible_buster,0) AS reproducible_buster,
COALESCE(reproducible_bullseye,0) AS reproducible_bullseye,
COALESCE(reproducible_bookworm,0) AS reproducible_bookworm,
+ COALESCE(reproducible_trixie,0) AS reproducible_trixie,
COALESCE(reproducible_unstable,0) AS reproducible_unstable,
COALESCE(reproducible_experimental,0) AS reproducible_experimental,
COALESCE(FTBR_stretch,0) AS FTBR_stretch,
COALESCE(FTBR_buster,0) AS FTBR_buster,
COALESCE(FTBR_bullseye,0) AS FTBR_bullseye,
COALESCE(FTBR_bookworm,0) AS FTBR_bookworm,
+ COALESCE(FTBR_trixie,0) AS FTBR_trixie,
COALESCE(FTBR_unstable,0) AS FTBR_unstable,
COALESCE(FTBR_experimental,0) AS FTBR_experimental,
COALESCE(FTBFS_stretch,0) AS FTBFS_stretch,
COALESCE(FTBFS_buster,0) AS FTBFS_buster,
COALESCE(FTBFS_bullseye,0) AS FTBFS_bullseye,
COALESCE(FTBFS_bookworm,0) AS FTBFS_bookworm,
+ COALESCE(FTBFS_trixie,0) AS FTBFS_trixie,
COALESCE(FTBFS_unstable,0) AS FTBFS_unstable,
COALESCE(FTBFS_experimental,0) AS FTBFS_experimental,
COALESCE(other_stretch,0) AS other_stretch,
COALESCE(other_buster,0) AS other_buster,
COALESCE(other_bullseye,0) AS other_bullseye,
COALESCE(other_bookworm,0) AS other_bookworm,
+ COALESCE(other_trixie,0) AS other_trixie,
COALESCE(other_unstable,0) AS other_unstable,
COALESCE(other_experimental,0) AS other_experimental
FROM (SELECT s.datum,
@@ -912,24 +916,28 @@ create_debian_png_from_table() {
COALESCE((SELECT e.reproducible FROM stats_builds_per_day AS e WHERE s.datum=e.datum AND suite='buster' $WHERE_EXTRA),0) AS reproducible_buster,
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='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,
(SELECT e.FTBR FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='buster' $WHERE_EXTRA) AS FTBR_buster,
(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='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,
(SELECT e.FTBFS FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='buster' $WHERE_EXTRA) AS FTBFS_buster,
(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='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,
(SELECT e.other FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='buster' $WHERE_EXTRA) AS other_buster,
(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='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
@@ -954,9 +962,10 @@ create_debian_png_from_table() {
stretch) COLORS=40 ;;
buster) COLORS=41 ;;
bullseye) COLORS=42 ;;
- bullseye) COLORS=43 ;;
- unstable) COLORS=44 ;;
- experimental) COLORS=45 ;;
+ bookworm) COLORS=43 ;;
+ trixie) COLORS=44 ;;
+ unstable) COLORS=45 ;;
+ experimental) COLORS=46 ;; # increasing this also needs changes in make_graph.py around line 64
esac
fi
local WIDTH=1920
=====================================
bin/reproducible_create_meta_pkg_sets.sh
=====================================
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2015-2022 Holger Levsen <holger at layer-acht.org>
+# Copyright 2015-2023 Holger Levsen <holger at layer-acht.org>
# 2023 Mattia Rizzolo <mattia at mapreri.org>
# released under the GPLv2
@@ -267,8 +267,10 @@ update_pkg_set_specific() {
else
if [ "$SUITE" = "bullseye" ] ; then
URL="https://cloud.debian.org/images/cloud/bullseye/daily/latest/debian-11-generic-amd64-daily.json"
- elif [ "$SUITE" = "bookworm" ] || [ "$SUITE" = "unstable" ] ; then
+ elif [ "$SUITE" = "bookworm" ] ; then
URL="https://cloud.debian.org/images/cloud/bookworm/daily/latest/debian-12-generic-amd64-daily.json"
+ elif [ "$SUITE" = "trixie" ] || [ "$SUITE" = "unstable" ] ; then
+ URL="https://cloud.debian.org/images/cloud/bookworm/daily/latest/debian-13-generic-amd64-daily.json"
else
echo "$SUITE not supported, erroring out."
exit 1
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/9e6da49f465b2e1ed4b0aa26243b1ec207c180b2...b9801380538613e7a15f3b69afb84f3fdcca8cfe
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/9e6da49f465b2e1ed4b0aa26243b1ec207c180b2...b9801380538613e7a15f3b69afb84f3fdcca8cfe
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/20230612/6fd3655d/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list