From f9147e8be131ec6f4be4c2791f2428c84e58a402 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 17 Jun 2015 01:21:20 +0200 Subject: reproducible: also track 'ftbfs' usertag --- TODO | 1 - bin/make_graph.py | 3 ++- bin/reproducible_common.sh | 2 +- bin/reproducible_db_maintenance.py | 4 ++++ bin/reproducible_html_graphs.sh | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/TODO b/TODO index 560e5129..9d9f0477 100644 --- a/TODO +++ b/TODO @@ -199,7 +199,6 @@ properties: ** reproducible_blacklist.sh should delete rbuild logs and debbindiff output too ** adopt usertag script from pkg-apparmor to notify us about new usertagged bugs automatically ** fix apache ssl configuration as hinted by eg https://sslcheck.globalsign.com/de/sslcheck?host=jenkins.debian.net#46.16.73.183 -** include "ftbfs" usertag in table+graph on dashboard * notes related ** #786396: classify issue by "toolchain" or "package" fix needed diff --git a/bin/make_graph.py b/bin/make_graph.py index db098b22..c86e64a8 100755 --- a/bin/make_graph.py +++ b/bin/make_graph.py @@ -42,7 +42,8 @@ def main(): "#729fcf", "#204a87", "#ef2929", "#a40000", \ "#888a85", "#2e3436", "#75507b", "#cc0000", \ "#ce5c00", "#73d216", "#edd400", "#f57900", \ - "#c17d11", "#3465a4", "#666666", "#AAAAAA" ))') + "#c17d11", "#3465a4", "#666666", "#aaaaaa", \ + "#aa00aa", "#ff55ff" ))') elif int(colors) == 40: r('palette(c("#4e9a06", "#000000"))') elif int(colors) == 41: diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 360a0cfc..c7860080 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -45,7 +45,7 @@ ARCHES="amd64" NUM_CPU=$(grep -c '^processor' /proc/cpuinfo) # existing usertags -USERTAGS="toolchain infrastructure timestamps fileordering buildpath username hostname uname randomness buildinfo cpu signatures environment umask" +USERTAGS="toolchain infrastructure timestamps fileordering buildpath username hostname uname randomness buildinfo cpu signatures environment umask ftbfs" # we only need them for html creation but we cannot declare them in a function declare -A SPOKENTARGET diff --git a/bin/reproducible_db_maintenance.py b/bin/reproducible_db_maintenance.py index 8b802200..3c31da97 100755 --- a/bin/reproducible_db_maintenance.py +++ b/bin/reproducible_db_maintenance.py @@ -376,6 +376,10 @@ schema_updates = { 14: [ # column to enable mail notification to maintainers 'ALTER TABLE sources ADD COLUMN notify_maintainer INTEGER NOT NULL DEFAULT 0', 'INSERT INTO rb_schema VALUES ("14", "' + now + '")'], + 15: [ # add columns to stats_bugs for new usertag ftbfs + '''ALTER TABLE stats_bugs ADD COLUMN open_ftbfs INTEGER''', + '''ALTER TABLE stats_bugs ADD COLUMN done_ftbfs INTEGER''', + 'INSERT INTO rb_schema VALUES ("15", "' + now + '")'], } diff --git a/bin/reproducible_html_graphs.sh b/bin/reproducible_html_graphs.sh index 5f845734..e34fba66 100755 --- a/bin/reproducible_html_graphs.sh +++ b/bin/reproducible_html_graphs.sh @@ -56,7 +56,7 @@ SUM_OPEN="$SUM_OPEN)" COLOR[0]=5 COLOR[1]=12 COLOR[2]=1 -COLOR[3]=28 +COLOR[3]=30 COLOR[4]=1 COLOR[5]=1 COLOR[6]=4 -- cgit v1.2.3-54-g00ecf