diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-03-03 15:27:38 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-03-03 15:27:38 +0100 |
| commit | 4a3b1ceef86c7d0183b89fc2eb769395068bb699 (patch) | |
| tree | b05e0d012ae92849b9382d0b3b48d3eb2828852d | |
| parent | b93995448ac8997db8f16636ee4614d0a2ef30e4 (diff) | |
| download | jenkins.debian.net-4a3b1ceef86c7d0183b89fc2eb769395068bb699.tar.xz | |
finally, query the right table and define shiny colors
| -rwxr-xr-x | bin/make_graph.py | 3 | ||||
| -rwxr-xr-x | bin/reproducible_html_graphs.sh | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/bin/make_graph.py b/bin/make_graph.py index 66554117..f3969376 100755 --- a/bin/make_graph.py +++ b/bin/make_graph.py @@ -30,6 +30,9 @@ def main(): # thanks to http://tango.freedesktop.org/Generic_Icon_Theme_Guidelines for those nice colors if int(colors) < 6: r('palette(c("#4e9a06", "#f57900", "#cc0000", "#2e3436", "#888a85"))') + elif int(colors) == 8: + r('palette(c("#4e9a06", "#73d216", "#ce5c00", "#f57900", \ + "#a40000", "#cc0000", "#2e3436", "#555753" ))') else: r('palette(c("#fce94f", "#c4a000", "#eeeeec", "#babdb6", \ "#fcaf3e", "#ce5c00", "#ad7fa8", "#5c3566", \ diff --git a/bin/reproducible_html_graphs.sh b/bin/reproducible_html_graphs.sh index 57878e3e..c988da8e 100755 --- a/bin/reproducible_html_graphs.sh +++ b/bin/reproducible_html_graphs.sh @@ -231,13 +231,13 @@ redo_png() { # FIXME: also generate this query for stretch and buster and beyond :) sqlite3 -init ${INIT} --nullvalue 0 -csv ${PACKAGES_DB} "select s.datum, s.reproducible as 'reproducible_sid', - COALESCE((SELECT e.reproducible FROM stats_pkg_state AS e where s.datum=e.datum and suite='experimental'),0) as 'reproducible_experimental', + COALESCE((SELECT e.reproducible FROM stats_builds_per_day AS e where s.datum=e.datum and suite='experimental'),0) as 'reproducible_experimental', s.unreproducible as 'unreproducible_sid', - (SELECT e.unreproducible FROM stats_pkg_state e WHERE s.datum=e.datum AND suite='experimental') AS unreproducible_experimental, + (SELECT e.unreproducible FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='experimental') AS unreproducible_experimental, s.FTBFS as 'FTBFS_sid', - (SELECT e.FTBFS FROM stats_pkg_state e WHERE s.datum=e.datum AND suite='experimental') AS FTBFS_experimental, + (SELECT e.FTBFS FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='experimental') AS FTBFS_experimental, s.other as 'other_sid', - (SELECT e.other FROM stats_pkg_state e WHERE s.datum=e.datum AND suite='experimental') AS other_experimental from stats_pkg_state as s where s.suite='sid' group by s.datum" >> ${TABLE[$1]}.csv + (SELECT e.other FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='experimental') AS other_experimental from stats_builds_per_day as s where s.suite='sid' group by s.datum" >> ${TABLE[$1]}.csv fi # only generate graph is the query returned data if [ $(cat ${TABLE[$1]}.csv | wc -l) -gt 1 ] ; then |