summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--TODO1
-rwxr-xr-xbin/make_graph.py5
-rwxr-xr-xbin/reproducible_common.sh4
-rwxr-xr-xbin/reproducible_html_graphs.sh4
4 files changed, 9 insertions, 5 deletions
diff --git a/TODO b/TODO
index a6d433b8..5da7c4ef 100644
--- a/TODO
+++ b/TODO
@@ -134,7 +134,6 @@ properties:
=== reproducible
-* graph new usertags: "signatures" + "environment"
* new job+page: "packages different from sid in our toolchain", not sure yet where to link that...
* run debbindiff against .changes files in current directory, instead of $LONGPATHES (due to #764459)
* reproducible: dont delete userContent/$pkg on build begin..
diff --git a/bin/make_graph.py b/bin/make_graph.py
index c1a080f8..73bc5ab2 100755
--- a/bin/make_graph.py
+++ b/bin/make_graph.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
-# Copyright 2009-2014 Holger Levsen (holger@layer-acht.org)
+# Copyright 2009-2015 Holger Levsen (holger@layer-acht.org)
#
# based on similar code taken from piuparts-reports.py written by me
@@ -36,7 +36,8 @@ def main():
"#e9b96e", "#8f5902", "#8ae234", "#4e9a06", \
"#729fcf", "#204a87", "#ef2929", "#a40000", \
"#888a85", "#2e3436", "#75507b", "#cc0000", \
- "#ce5c00", "#73d216"))')
+ "#ce5c00", "#73d216", "#edd400", "#f57900", \
+ "#c17d11", "#3465a4"))')
r('v <- t[0:nrow(t),0:'+colors+']')
# make graph since day 1
r('barplot(t(v),col = 1:'+columns+', main="'+mainlabel+'", xlab="", ylab="'+ylabel+'", space=0, border=NA)')
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index c88483b7..8f3f2375 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -97,6 +97,10 @@ elif [ ! -f ${PACKAGES_DB} ] ; then
done_buildinfo INTEGER,
open_cpu INTEGER,
done_cpu INTEGER,
+ open_signatures INTEGER,
+ done_signatures INTEGER,
+ open_environment INTEGER,
+ done_environment INTEGER,
PRIMARY KEY (datum))'
sqlite3 ${PACKAGES_DB} '
CREATE TABLE stats_notes
diff --git a/bin/reproducible_html_graphs.sh b/bin/reproducible_html_graphs.sh
index 304225be..d801427c 100755
--- a/bin/reproducible_html_graphs.sh
+++ b/bin/reproducible_html_graphs.sh
@@ -112,7 +112,7 @@ for i in $(seq 1 ${#META_PKGSET[@]}) ; do
done
# query bts
-USERTAGS="toolchain infrastructure timestamps fileordering buildpath username hostname uname randomness buildinfo cpu"
+USERTAGS="toolchain infrastructure timestamps fileordering buildpath username hostname uname randomness buildinfo cpu signatures environment"
RESULT=$(sqlite3 -init ${INIT} ${PACKAGES_DB} "SELECT * from ${TABLE[3]} WHERE datum = \"$DATE\"")
if [ -z $RESULT ] ; then
declare -a DONE
@@ -152,7 +152,7 @@ FIELDS[6]="datum, reproducible, unreproducible, FTBFS, other"
COLOR[0]=5
COLOR[1]=4
COLOR[2]=3
-COLOR[3]=22
+COLOR[3]=26
COLOR[4]=1
COLOR[5]=1
COLOR[6]=4