contest: gh: remember to abort the merge

Netdev foundation NIPA was mis-configured (missing git config
to auto-stage rerere), the runner would fail to check out
the tree after a failed merge. Make sure we clean up failed merges.

Signed-off-by: Jakub Kicinski <[email protected]>

Author: kuba-moo

contest/remote/gh.py

@@ -157,6 +157,7 @@ def test_run(binfo, rinfo, cbarg, config, start):
         # If rerere fixed it, just commit
         res = subprocess.run('git diff -s --exit-code', cwd=tree_path, shell=True)
         if res.returncode != 0:
+            subprocess.run('git merge --abort', cwd=tree_path, shell=True)
             return [{'test': config.get('executor', 'test'),
                      'group': config.get('executor', 'group'),
                      'result': 'skip', 'link': config.get('gh', 'link')}]