cs-bisection-step: Flail detection: look only at our blessing

When looking for identical previously flights, consider only ones
which have the same blessing as our prospective flight will have.

There are good reasons why apparently identical flights might appear
with other in-scope blessings: notably, a single-test-job main branch
might produce many failures from its push gate, which would all have
the main branch blessing (rather than the bisector's blessing).

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/cs-bisection-step b/cs-bisection-step
index 4891e939d32a9833ccd032228d5b489603ce0c79..30359129c96987ca2dc83fdb35c94b7544a3d492 100755 (executable)
--- a/cs-bisection-step
+++ b/cs-bisection-step
@@ -1230,7 +1230,10 @@ END
     # one side is NULL (runvar was missing) it still counts.
     my $equalflightsqt = <<END;
         SELECT flight, blessing, started FROM flights
-           WHERE branch=? AND $blessingscond $maxflight_cond
+           WHERE branch=?  $maxflight_cond
+              AND blessing = (
+               SELECT intended FROM flights WHERE flight = ?
+                )
              AND NOT EXISTS (
                SELECT 1
                  FROM $runvarsqt1 r1 FULL OUTER JOIN
@@ -1260,7 +1263,7 @@ END
         $minflight //= 0;
        print DEBUG "minflight=$minflight\n";
 
-       $equalflightsq->execute($branch, $popflight, $minflight);
+       $equalflightsq->execute($branch, $popflight, $popflight, $minflight);
        my $nequalflights = 0;
        my $explanation = '';
        while (my $identical = $equalflightsq->fetchrow_hashref()) {