blessings

diff --git a/.gitignore b/.gitignore
index a16bfc042d6a3014809717cb8dcc1e6da1780de1..6a07ca6c821707f4d81e0e4fb60414aecbd9ab22 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@ contrib-graph.blame
 contrib-graph.symbolic
 jobs-branches.fig
 jobs-branches.fig.*.[0-9]
+blessings.fig
+hostflags.txt

diff --git a/Makefile b/Makefile
index 136d8a9465ebfe8229bcfe1e352807a3dadb8e54..29e352a6f3e69a95a9211bd06ce7eb6985a7591a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-SLIDES=title listscreenshot bisection jobs-branches readme-excerpt
+SLIDES=title listscreenshot bisection jobs-branches readme-excerpt blessings
 SLIDEFILES=$(addsuffix .ps, $(SLIDES))
 
 o= >$@.new && mv -f $@.new $@
@@ -26,11 +26,14 @@ slides.ps: $(SLIDEFILES) Makefile
 slides.pdf:    slides.ps Makefile
        ps2pdf $< $@
 
-datascript-run:
-       ./datascript
+datascript-run gitminescript-run: %-run: %
+       ./$@
 
 jobsbreak=40
 
+blessings.fig: blessings.fig.in hostflags.txt fig-filler-in Makefile 
+       ./fig-filler-in <$< L hostflags.txt $o
+
 jobs-branches.fig: fig-filler-in Makefile
 jobs-branches.fig: jobs-branches.fig.in list-branches.data list-jobs.data
        sed -n '1,$(jobsbreak)p' list-jobs.data >$@.j.0

diff --git a/blessings.fig.in b/blessings.fig.in
new file mode 100644 (file)
index 0000000..c871924
--- /dev/null
+++ b/blessings.fig.in
@@ -0,0 +1,16 @@
+#FIG 3.2  Produced by xfig version 3.2.5b
+Landscape
+Center
+Metric
+A4      
+100.00
+Single
+-2
+1200 2
+0 32 #484848
+2 2 0 1 7 7 50 -1 -1 0.000 0 0 7 0 0 5
+        12600 9540 12330 9540 12330 9810 12600 9810 12600 9540
+4 0 1 50 -1 14 12 0.0000 4 150 1920 360 1890 %L/^blessed-real\001
+4 0 0 50 -1 12 12 0.0000 4 120 360 360 1125 %L1\001
+4 0 0 50 -1 14 12 0.0000 4 165 1920 360 1620 %L/^arch-(?!xen)\001
+4 0 32 50 -1 14 12 0.0000 4 120 360 360 900 %L0\001

diff --git a/datascript b/datascript
index 2398c99d2dd64a714e2a6ab8a5ce4a5bc745545b..6435f2c94a788441f18eb4252755b6ed46c23ec6 100755 (executable)
--- a/datascript
+++ b/datascript
@@ -3,6 +3,8 @@ set -e
 set -o pipefail
 rm -f *.data
 
+./hostflags-mine
+
 ./genmine >psql-cmds
 psql -d osstestdb -h osstestdb.db.cam.xci-test.com -f psql-cmds
 

diff --git a/fig-filler-in b/fig-filler-in
index 02f9ff165ae83501407027bc5bd5ef9d7d7fee39..d1949fb34ef473ea574f945c2ca123b990c488b6 100755 (executable)
--- a/fig-filler-in
+++ b/fig-filler-in
@@ -3,18 +3,27 @@
 use strict;
 
 our %tmpl;
-# $tmpl{BRANCH}[]{Prefix}
-# $tmpl{BRANCH}[]{Suffix}
-# $tmpl{BRANCH}[]{X}
-# $tmpl{BRANCH}[]{Y}
+# $tmpl{BRANCH}[0|1]{Prefix}
+# $tmpl{BRANCH}[0|1]{Suffix}
+# $tmpl{BRANCH}[0|1]{C}[0|1] = coordinate
+# $tmpl{BRANCH}[2][]{Regexp}
+# $tmpl{BRANCH}[2][]{Prefix}
+# $tmpl{BRANCH}[2][]{Suffix}
 
 while (<STDIN>) {
-    if (my ($x,$y,$key,$n) = m/ (\d+) (\d+) \%([A-Z0-9]+)([01])/) {
-        $tmpl{$key}[$n] = {
+    if (my ($x,$y,$key,$n) =
+        m/ (\d+) (\d+) \%([A-Z0-9]+)([01]|\/(?:(?!\\001).)*)/) {
+        my $tmpl = {
             Prefix => $`,
             Suffix => $', #',
-            C => [ $x, $y ],
         };
+        if ($n =~ s/^\///) {
+            $tmpl->{Regexp} = $n;
+            push @{ $tmpl{$key}[2] }, $tmpl;
+        } else {
+            $tmpl->{C} = [ $x, $y ];
+            $tmpl{$key}[$n] = $tmpl;
+        }
     } else {
         print or die $!;
     }
@@ -35,11 +44,19 @@ while (@ARGV) {
     open F, "<$file" or die "$file $!";
     while (<F>) {
         chomp;
+        my $rtmpl = $tmpl;
+        foreach my $entry (@{ $tmpl{$key}[2] }) {
+            next unless m/$entry->{Regexp}/;
+use Data::Dumper;
+print STDERR "matched $_:",Dumper($entry);
+            $rtmpl = $entry;
+            last;
+        }
         s/\\/\\\\/g;
-        print $tmpl->{Prefix} or die $!;
+        print $rtmpl->{Prefix} or die $!;
         printf " %d %d ", @c or die $!;
         print $_ or die $!;
-        print $tmpl->{Suffix} or die $!;
+        print $rtmpl->{Suffix} or die $!;
         foreach my $c (qw(0 1)) { $c[$c] += $d[$c]; }
     }
     close F;

diff --git a/hostflags-mine b/hostflags-mine
new file mode 100755 (executable)
index 0000000..d9498f5
--- /dev/null
+++ b/hostflags-mine
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+exec >hostflags.txt
+cd ${OSSTEST_GIT:=$HOME/work/testing.git/.git}/..
+./mg-hosts showflags

diff --git a/talk.txt b/talk.txt
index 30a002b9a0d625355e3e3f569422fe0b87f9f141..5c716cbba69ae03592c0918d6a0b3129bfe34e8e 100644 (file)
--- a/talk.txt
+++ b/talk.txt
@@ -46,10 +46,12 @@ webserver for autoinstall data.  You can then use osstest to provision
 test boxes, and/or use it to run specific tests.  This is very useful
 for developing osstest itself.
 
-[hosting]
+[6 blessings chart]
 
 Currently osstest is running in a test network at Citrix's Cambridge
-office in the UK.  There is a dedicated pool of just 11 test machines.
+office in the UK.  There is a dedicated pool of just 13 x86 test
+machines.  For ARM osstest has two nodes of a Calxeda server (sadly no
+longer supported) and a small devboard-based build farm.
 
 Test reports and logs are posted publicly; the osstest system's source
 code and deployment documentation is of course published (and