systemtest: Abort the failed rebase

So that subsequent git commands (from another test) work

Signed-off-by: George Dunlap <george.dunlap@citrix.com>

diff --git a/systemtest.go b/systemtest.go
index a0992ab44b4293877aff2ff7c8a21ae81d003f19..911bb57b46db3c927aaf5a2e18d33df219b12da2 100644 (file)
--- a/systemtest.go
+++ b/systemtest.go
@@ -448,7 +448,16 @@ func Story206Backport(st *SystemTest) bool {
        // - How many patches had been applied?  (0)
 
        // Fake things up:
+
+       xr := G.repos.XenRepos[TreeXen]
        // - git rebase --abort
+       if _, err := xr.RebaseAbort(); err != nil {
+               st.Errorf("Error aborting rebase: %v\n", err)
+               return false
+       }
+
+       // Tree will be cleaned up on re-run
+
        // - git checkout -B xsa/NNN/4.8 xsa/NNN/4.8-baseline
        // - git am 4.8 patch series