wip

diff --git a/.gitignore b/.gitignore
index 00204f0a5c37731a4a4ec6c6df1db12b4cdc886d..a2317408873afa38a61d4288e60e496824ae0cd7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 *~
 *.data
+*.gnuplot
+psql-cmds

diff --git a/datascript b/datascript
new file mode 100755 (executable)
index 0000000..976fefd
--- /dev/null
+++ b/datascript
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+set -o pipefail
+rm -f *.data
+./genmine >psql-cmds
+psql -d osstestdb -h osstestdb.db.cam.xci-test.com -f psql-cmds
+cat branches+*.data | ./psql2gnuplot >branches.gnuplot
+./psql2gnuplot jobs.data >jobs.gnuplot

diff --git a/genmine b/genmine
new file mode 100755 (executable)
index 0000000..1987072
--- /dev/null
+++ b/genmine
@@ -0,0 +1,28 @@
+#!/usr/bin/perl -w
+use strict;
+
+our ($asof) = @ARGV;
+$asof ||= time;
+
+my $ystart = $asof - 365.25*86400;
+
+print <<END or die $!;
+
+\\pset border 0
+\\pset fieldsep '\t'
+\\pset t on
+
+select count(*), flight, branch, started from jobs join flights using (flight) where branch='xen-unstable' and blessing='real' and started >=$ystart and started <$asof  group by flight, branch, started order by flight desc \\g jobs.data
+
+END
+
+for (my $back=365; $back>=0; $back--) {
+    my $wend = $asof - $back*86400;
+    my $wstart = $wend - 86400*28;
+    my $backp = sprintf "%04d", $back;
+    print <<END or die $!;
+
+select $wend, count(distinct branch) from flights where  blessing='real' and (started >= $wstart and started <= $wend) \\g branches+$backp.data
+
+END
+}

diff --git a/jobs.runes b/jobs.runes
index fb591eab3debca60970c6b936d467b1d54f232ae..b1c8acea6b650e2d5872e43188651b0d185bcc7b 100644 (file)
--- a/jobs.runes
+++ b/jobs.runes
@@ -1,8 +1,13 @@
-# select count(*), flight, branch, started from jobs join flights using (flight) where branch='xen-unstable' and blessing='real' and started >=1374166076  group by flight, branch, started order by flight desc \g jobs.data
+
+set term x11 persist
 
 set yrange [0:*]
 set xtics 5000000
 set xdata time
 set timefmt "%s"
-set term x11 persist
-plot 'jobs.gnuplot' using 4:1 title 'jobs in xen-unstable'
+
+set border 11
+set key left
+set y2range [0:*]
+set y2tics                                                                                                         
+plot 'jobs.gnuplot' using 4:1 title 'jobs in xen-unstable', 'branches.gnuplot' using 1:2 axes x1y2 title 'branches ("[BRANCH test]")'

diff --git a/newjobs b/newjobs
new file mode 100644 (file)
index 0000000..2e21df4
--- /dev/null
+++ b/newjobs
@@ -0,0 +1,114 @@
+--- u  2014-07-18 19:06:26.792430364 +0100
++++ t  2014-07-18 19:06:22.420333634 +0100
+@@ -1,81 +1,76 @@
+ build-amd64
++build-amd64-libvirt
+ build-amd64-oldkern
+ build-amd64-pvops
++build-amd64-rumpuserxen
++build-amd64-xend
+ build-armhf
++build-armhf-libvirt
++build-armhf-pvops
+ build-i386
++build-i386-libvirt
+ build-i386-oldkern
+ build-i386-pvops
+-build-i386-xcpkern
++build-i386-rumpuserxen
++build-i386-xend
++test-amd64-amd64-libvirt
+ test-amd64-amd64-pair
+ test-amd64-amd64-pv
+-test-amd64-amd64-qemut-win
+-test-amd64-amd64-qemuu-win
+-test-amd64-amd64-win
++test-amd64-amd64-rumpuserxen-amd64
++test-amd64-amd64-rumpuserxen-i386
+ test-amd64-amd64-xl
+ test-amd64-amd64-xl-pcipt-intel
+-test-amd64-amd64-xl-qemut-win
++test-amd64-amd64-xl-qemut-debianhvm-amd64
+ test-amd64-amd64-xl-qemut-win7-amd64
+ test-amd64-amd64-xl-qemut-winxpsp3
+-test-amd64-amd64-xl-qemuu-win
++test-amd64-amd64-xl-qemuu-debianhvm-amd64
++test-amd64-amd64-xl-qemuu-ovmf-amd64
+ test-amd64-amd64-xl-qemuu-win7-amd64
+ test-amd64-amd64-xl-qemuu-winxpsp3
+ test-amd64-amd64-xl-sedf
+ test-amd64-amd64-xl-sedf-pin
+-test-amd64-amd64-xl-win
+ test-amd64-amd64-xl-win7-amd64
+ test-amd64-amd64-xl-winxpsp3
++test-amd64-i386-freebsd10-amd64
++test-amd64-i386-freebsd10-i386
++test-amd64-i386-libvirt
+ test-amd64-i386-pair
+ test-amd64-i386-pv
+ test-amd64-i386-qemut-rhel6hvm-amd
+ test-amd64-i386-qemut-rhel6hvm-intel
+-test-amd64-i386-qemut-win
+-test-amd64-i386-qemut-win-vcpus1
++test-amd64-i386-qemuu-freebsd10-amd64
++test-amd64-i386-qemuu-freebsd10-i386
+ test-amd64-i386-qemuu-rhel6hvm-amd
+ test-amd64-i386-qemuu-rhel6hvm-intel
+-test-amd64-i386-qemuu-win
+-test-amd64-i386-qemuu-win-vcpus1
+ test-amd64-i386-rhel6hvm-amd
+ test-amd64-i386-rhel6hvm-intel
+-test-amd64-i386-win
+-test-amd64-i386-win-vcpus1
++test-amd64-i386-rumpuserxen-i386
+ test-amd64-i386-xend-qemut-winxpsp3
+ test-amd64-i386-xend-qemuu-winxpsp3
+ test-amd64-i386-xend-winxpsp3
+ test-amd64-i386-xl
+ test-amd64-i386-xl-credit2
+ test-amd64-i386-xl-multivcpu
++test-amd64-i386-xl-qemut-debianhvm-amd64
+ test-amd64-i386-xl-qemut-win7-amd64
+-test-amd64-i386-xl-qemut-win-vcpus1
++test-amd64-i386-xl-qemut-winxpsp3
+ test-amd64-i386-xl-qemut-winxpsp3-vcpus1
++test-amd64-i386-xl-qemuu-debianhvm-amd64
++test-amd64-i386-xl-qemuu-ovmf-amd64
+ test-amd64-i386-xl-qemuu-win7-amd64
+-test-amd64-i386-xl-qemuu-win-vcpus1
++test-amd64-i386-xl-qemuu-winxpsp3
+ test-amd64-i386-xl-qemuu-winxpsp3-vcpus1
+ test-amd64-i386-xl-win7-amd64
+-test-amd64-i386-xl-win-vcpus1
++test-amd64-i386-xl-winxpsp3
+ test-amd64-i386-xl-winxpsp3-vcpus1
+-test-amd64-xcpkern-i386-pair
+-test-amd64-xcpkern-i386-pv
+-test-amd64-xcpkern-i386-rhel6hvm-amd
+-test-amd64-xcpkern-i386-rhel6hvm-intel
+-test-amd64-xcpkern-i386-win
+-test-amd64-xcpkern-i386-xl
+-test-amd64-xcpkern-i386-xl-credit2
+-test-amd64-xcpkern-i386-xl-multivcpu
+-test-amd64-xcpkern-i386-xl-win
++test-armhf-armhf-libvirt
++test-armhf-armhf-xl
++test-i386-i386-libvirt
+ test-i386-i386-pair
+ test-i386-i386-pv
+-test-i386-i386-qemut-win
+-test-i386-i386-qemuu-win
+-test-i386-i386-win
++test-i386-i386-rumpuserxen-i386
+ test-i386-i386-xl
+-test-i386-i386-xl-qemut-win
+ test-i386-i386-xl-qemut-winxpsp3
+-test-i386-i386-xl-qemuu-win
+ test-i386-i386-xl-qemuu-winxpsp3
+-test-i386-i386-xl-win
+ test-i386-i386-xl-winxpsp3
+-test-i386-xcpkern-i386-pair
+-test-i386-xcpkern-i386-pv
+-test-i386-xcpkern-i386-win
+-test-i386-xcpkern-i386-xl
+ 

diff --git a/psql2gnuplot b/psql2gnuplot
index f8e7150d2abc5cfb8ab8149dcbcb2df81b73493a..2f8765ea0304e19152a7fe66e34ea999a4d83766 100755 (executable)
--- a/psql2gnuplot
+++ b/psql2gnuplot
@@ -1,7 +1,4 @@
 #!/usr/bin/perl -wp
 use strict;
-$_="" if $.==1;
 $_="" unless m/[^-+ \t\n]/;
-$_="" if m/^\(\d+ rows\)$/;
-s/\|//g;
 s/\S*[^0-9. \t\n]\S*/"$&"/g;