cs-bisection-step: ensure that failure flight and basis pass used the same vcs

diff --git a/cs-bisection-step b/cs-bisection-step
index 5d71b9c71e43956154bbfed4f40d707323679e75..6a7979f6a9478f043423a195973c51552ecce22c 100755 (executable)
--- a/cs-bisection-step
+++ b/cs-bisection-step
@@ -349,6 +349,9 @@ END
             next;
         }
 
+       my $failrmap = flight_rmap($tryfail->{flight});
+       next unless $failrmap;
+
         print STDERR "/";
         my ($basisrow,$trybasis);
         $basisq->execute($job,$testid,$branch);
@@ -359,6 +362,24 @@ END
                 print STDERR " [$basishosts]";
                 next;
             }
+           my $basisrmap = flight_rmap($trybasis->{flight});
+           my @bad;
+#print STDERR Dumper($failrmap, $basisrmap);
+           foreach my $tree (keys %$failrmap) {
+               my $failvcs = $failrmap->{$tree}{Url};
+               my $basisvcs = $basisrmap->{$tree}{Url};
+#print STDERR Dumper($failvcs, $basisvcs);
+               next unless defined $basisvcs;
+               $failvcs=~ s/.*(\.\w+)$/$1/ or warn"$tryfail->{flight} $tree ";
+               $basisvcs=~s/.*(\.\w+)$/$1/ or warn"$trybasis->{flight} $tree ";
+#print STDERR "COMPARE $failvcs $basisvcs\n";
+               push @bad, "$tree:<$failvcs>/<$basisvcs>"
+                    if $failvcs ne $basisvcs;
+           }
+           if (@bad) {
+               print STDERR " (vcs mismatch: @bad)";
+               next;
+           }
             $basisrow= $trybasis;
             last;
         }