[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Debian: fixup code to deal with 4 suites being tested
Holger Levsen
holger at layer-acht.org
Mon Jun 19 12:36:28 UTC 2017
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch master
in repository jenkins.debian.net.
commit c4e208ab523fedb9f7ed5f76f1c5d80fbf3e33e9
Author: Holger Levsen <holger at layer-acht.org>
Date: Mon Jun 19 14:36:24 2017 +0200
reproducible Debian: fixup code to deal with 4 suites being tested
Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
TODO4buster.txt | 1 -
bin/make_graph.py | 4 +++-
bin/reproducible_common.sh | 13 +++++++++++--
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/TODO4buster.txt b/TODO4buster.txt
index cb52bf2..3e57486 100644
--- a/TODO4buster.txt
+++ b/TODO4buster.txt
@@ -5,6 +5,5 @@ special deployement needed for this:
changes not yet prepared in git
-------------------------------
missing bits for the buster coming:
- * _common.sh (only partly done so far…)
* _repository_comparison.sh
finally, remove this file again.
diff --git a/bin/make_graph.py b/bin/make_graph.py
index d97f6f8..ebe98f5 100755
--- a/bin/make_graph.py
+++ b/bin/make_graph.py
@@ -49,8 +49,10 @@ def main():
elif int(colors) == 40:
r('palette(c("#4e9a06", "#000000"))')
elif int(colors) == 41:
- r('palette(c("#73d216", "#000000"))')
+ r('palette(c("#57a231", "#000000"))')
elif int(colors) == 42:
+ r('palette(c("#73d216", "#000000"))')
+ elif int(colors) == 43:
r('palette(c("#8ae234", "#000000"))')
# "revert the hack" (it's still a hack :)
if int(colors) >= 40:
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index d98945a..925c816 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -698,28 +698,36 @@ create_png_from_table() {
# compatibility with postgres
query_to_csv "SELECT stats.datum,
COALESCE(reproducible_stretch,0) AS reproducible_stretch,
+ COALESCE(reproducible_buster,0) AS reproducible_buster,
COALESCE(reproducible_unstable,0) AS reproducible_unstable,
COALESCE(reproducible_experimental,0) AS reproducible_experimental,
COALESCE(unreproducible_stretch,0) AS unreproducible_stretch,
+ COALESCE(unreproducible_buster,0) AS unreproducible_buster,
COALESCE(unreproducible_unstable,0) AS unreproducible_unstable,
COALESCE(unreproducible_experimental,0) AS unreproducible_experimental,
COALESCE(FTBFS_stretch,0) AS FTBFS_stretch,
+ COALESCE(FTBFS_buster,0) AS FTBFS_buster,
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_unstable,0) AS other_unstable,
COALESCE(other_experimental,0) AS other_experimental
FROM (SELECT s.datum,
COALESCE((SELECT e.reproducible FROM stats_builds_per_day AS e WHERE s.datum=e.datum AND suite='stretch' $WHERE_EXTRA),0) AS reproducible_stretch,
+ 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='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.unreproducible FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='stretch' $WHERE_EXTRA) AS unreproducible_stretch,
+ (SELECT e.unreproducible FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='buster' $WHERE_EXTRA) AS unreproducible_buster,
(SELECT e.unreproducible FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='unstable' $WHERE_EXTRA) AS unreproducible_unstable,
(SELECT e.unreproducible FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='experimental' $WHERE_EXTRA) AS unreproducible_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='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='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
@@ -742,8 +750,9 @@ create_png_from_table() {
if [ $1 -eq 2 ] ; then
case "$SUITE" in
stretch) COLORS=40 ;;
- unstable) COLORS=41 ;;
- experimental) COLORS=42 ;;
+ buster) COLORS=41 ;;
+ unstable) COLORS=42 ;;
+ experimental) COLORS=43 ;;
esac
fi
local WIDTH=1920
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git
More information about the Qa-jenkins-scm
mailing list