cs-adjust-flight: Allow adjusting "this" flight

This allows cs-adjust-flight to be run by hand to adjust runvars, in a
flight being used with hand-invocation of ./ts-* scripts.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Tested-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
v17: Better documentation of running: flight status
v14: New patch

diff --git a/cs-adjust-flight b/cs-adjust-flight
index d70abf7daffe62e108a90a4f8367cf97620c8ad4..a72cd8846cb37b159aa52c4a146bc3018513703c 100755 (executable)
--- a/cs-adjust-flight
+++ b/cs-adjust-flight
@@ -28,6 +28,8 @@
 # <dst-flight>:
 #   <flight>
 #   new:<intended-blessing>
+#   running:                 uses OSSTEST_FLIGHT (flight referred to
+#                             must be blessed `running' or `constructing')
 #
 # options:
 #   -v              verbose - list changes to stderr
@@ -395,6 +397,13 @@ sub main () {
             verbose_discard();
             changes();
         });
+    } elsif ($dstflightspec =~ m/^running:$/) {
+        $dstflight = $ENV{OSSTEST_FLIGHT} // die;
+        db_retry($dstflight,[qw(constructing running)],
+                 $dbh_tests, [qw(flights)], sub {
+            verbose_discard();
+            changes();
+        });
     } elsif ($dstflightspec =~ m/^new:/) {
         my $intended = $'; #';
         db_retry($dbh_tests, [qw(flights)], sub {