[PATCH OSSTEST RFC 0/2] simplify testing with adhoc jobs

[PATCH OSSTEST RFC 0/2] simplify testing with adhoc jobs

[Ian Campbell]

While I was doing some adhoc testing on chardonnay I needed to define some
adhoc recipes and ended up writing the following two patches.

In the end I didn't end up using the first (I just created the job out of
whole cloth rather than copying an existing template and modifying).

For the second I was using an sg-run-job-adhoc containing:
    proc need-hosts/adhoc-xen-boot-x5 {} { return host }
    proc run-job/adhoc-xen-boot-x5 {} {
        repeat-ts 5 xen-boot.repeat \
                   ts-host-reboot     host \; \
                   ts-host-ping-check host 
    }
Which arguably could a useful addition to sg-run-job proper.

Anyway, here they are...

We also discussed making it possible to invert the bisector (i.e. to look
for a patch which fixed an issue), in the end by the time I'd done a bit of
adhoc work to narrow the range down to something the bisector wouldn't balk
at I had a pretty good guess which merge commit it was going to be, so
finding the commit was just a few more adhoc jobs.

Ian.

[PATCH OSSTEST RFC 1/2] cs-adjust-flight: add recipe-set to adjust the recipe for a set of jobs

[Ian Campbell]

When constructing an adhoc test it may be useful to copy an existing
job's configuration but run it with a custom recipe.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 cs-adjust-flight | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/cs-adjust-flight b/cs-adjust-flight
index 9e011c6..662b8e9 100755
--- a/cs-adjust-flight
+++ b/cs-adjust-flight
@@ -12,6 +12,7 @@
 #   runvar-del <job-spec> <var-spec>
 #   runvar-change <job-spec> <var-spec> <old-value> <new-value>
 #   runvar-perlop <job-spec> <var-spec> <perl-expr>
+#   recipe-set <job-spec> <new-value>
 #   intended-blessing <intended-blessing>
 #
 # <foo-spec>:
@@ -276,6 +277,21 @@ sub change__runvar_perlop {
     }, 'IGNORE');
 }
 
+sub change__recipe_set {
+    die unless @changes >= 2;
+    my $jobs = shift @changes;
+    my $recipe = shift @changes;
+
+    for_jobs($dstflight, $jobs, sub {
+	my ($job) = @_;
+	$dbh_tests->do("UPDATE jobs".
+		       "   SET recipe = ?".
+		       " WHERE flight = ? AND job = ?",
+		       {}, $recipe, $dstflight, $job);
+	verbose "$dstflight $job recipe set to $recipe\n";
+    });
+}
+
 sub change__intended_blessing {
     die unless @changes >= 1;
     my $blessing = shift @changes;
-- 
2.5.1

[PATCH OSSTEST RFC 2/2] sg-run-job: support dropping in adhoc test recipes

[Ian Campbell]

By reading sg-run-job-adhoc if it exists.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 sg-run-job | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sg-run-job b/sg-run-job
index 0b0449b..c51a508 100755
--- a/sg-run-job
+++ b/sg-run-job
@@ -370,6 +370,10 @@ proc run-job/test-rumpuserxen {} {
                  ts-guest-destroy-hard            host   $g   +
 }
 
+if {[file exists sg-run-job-adhoc]} {
+    source sg-run-job-adhoc
+}
+
 #---------- builds ----------
 
 proc need-hosts/build {} { return BUILD }
-- 
2.5.1

Re: [PATCH OSSTEST RFC 1/2] cs-adjust-flight: add recipe-set to adjust the recipe for a set of jobs

[Ian Jackson]

Ian Campbell writes ("[PATCH OSSTEST RFC 1/2] cs-adjust-flight: add recipe-set to adjust the recipe for a set of jobs"):
> When constructing an adhoc test it may be useful to copy an existing
> job's configuration but run it with a custom recipe.

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

Re: [PATCH OSSTEST RFC 2/2] sg-run-job: support dropping in adhoc test recipes

[Ian Jackson]

Ian Campbell writes ("[PATCH OSSTEST RFC 2/2] sg-run-job: support dropping in adhoc test recipes"):
> By reading sg-run-job-adhoc if it exists.
...
> +if {[file exists sg-run-job-adhoc]} {
> +    source sg-run-job-adhoc
> +}
> +

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>