summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-03-14 20:42:36 +0100
committerHolger Levsen <holger@layer-acht.org>2015-03-14 20:42:36 +0100
commite4a98edf0b80c036c62e9a21a45ce1b0f373d56b (patch)
tree68298d97125522d4d7df58060a9adc9b16f3a817 /bin
parentbbaa6f15d9b874d4e14dab4c0abb7b906d7e124f (diff)
downloadjenkins.debian.net-e4a98edf0b80c036c62e9a21a45ce1b0f373d56b.tar.xz
reproducible: fixup: match suites ordering in query
Diffstat (limited to 'bin')
-rwxr-xr-xbin/reproducible_html_graphs.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/reproducible_html_graphs.sh b/bin/reproducible_html_graphs.sh
index 6f5dcf15..1b12418f 100755
--- a/bin/reproducible_html_graphs.sh
+++ b/bin/reproducible_html_graphs.sh
@@ -280,20 +280,20 @@ create_png_from_table() {
# run query
if [ $1 -eq 1 ] ; then
# not sure if it's worth to generate the following query...
- sqlite3 -init ${INIT} --nullvalue 0 -csv ${PACKAGES_DB} "select s.datum,
- s.reproducible as 'reproducible_testing',
+ sqlite3 -init ${INIT} --nullvalue 0 -csv ${PACKAGES_DB} "SELECT s.datum,
+ COALESCE((SELECT e.reproducible FROM stats_builds_per_day AS e where s.datum=e.datum and suite='testing'),0) as 'reproducible_testing',
COALESCE((SELECT e.reproducible FROM stats_builds_per_day AS e where s.datum=e.datum and suite='unstable'),0) as 'reproducible_unstable',
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_testing',
+ (SELECT e.unreproducible FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='testing') AS unreproducible_testing,
(SELECT e.unreproducible FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='unstable') AS unreproducible_unstable,
(SELECT e.unreproducible FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='experimental') AS unreproducible_experimental,
- s.FTBFS as 'FTBFS_testing',
+ (SELECT e.FTBFS FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='testing') AS FTBFS_testing,
(SELECT e.FTBFS FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='unstable') AS FTBFS_unstable,
(SELECT e.FTBFS FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='experimental') AS FTBFS_experimental,
- s.other as 'other_testing',
+ (SELECT e.other FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='testing') AS other_testing,
(SELECT e.other FROM stats_builds_per_day e WHERE s.datum=e.datum AND suite='unstable') AS other_unstable,
(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='testing' GROUP BY s.datum" >> ${TABLE[$1]}.csv
+ FROM stats_builds_per_day AS s GROUP BY s.datum" >> ${TABLE[$1]}.csv
elif [ $1 -eq 2 ] ; then
sqlite3 -init ${INIT} -csv ${PACKAGES_DB} "SELECT datum, ((oldest_reproducible + oldest_unreproducible + oldest_FTBFS)/3) FROM ${TABLE[$1]} ${WHERE_EXTRA} ORDER BY datum" >> ${TABLE[$1]}.csv
elif [ $1 -eq 7 ] ; then