[PATCH 1/3] ci: cleanup tmp after repro test failed

[Uladzimir Bely <ubely@ilbers.de>]

If repro test fails for some reason, "tmp" directory is left dirty
and may impact on the following tests that build the same targets.

This can cause errors like "Release signed by unknown key" because
custom distro keyring was left from the previous signed repro test.

Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
 testsuite/cibase.py |  3 ---
 testsuite/citest.py | 10 ++++++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/testsuite/cibase.py b/testsuite/cibase.py
index 0281be41..4a942ae0 100755
--- a/testsuite/cibase.py
+++ b/testsuite/cibase.py
@@ -45,9 +45,6 @@ class CIBaseTest(CIBuilder):
             # Try to build with changed configuration with no cleanup
             self.bitbake(targets, **kwargs)
 
-        # Cleanup
-        self.delete_from_build_dir('tmp')
-
     def perform_ccache_test(self, targets):
         build_dir, bb_args = self.prep('Isar ccache build', targets, 0, 0)
 
diff --git a/testsuite/citest.py b/testsuite/citest.py
index 8f47338c..5d4cd0aa 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -31,7 +31,10 @@ class ReproTest(CIBaseTest):
                   ]
 
         self.init()
-        self.perform_repro_test(targets, signed=True)
+        try:
+            self.perform_repro_test(targets, signed=True)
+        finally:
+            self.delete_from_build_dir('tmp')
 
     def test_repro_unsigned(self):
         targets = [
@@ -40,7 +43,10 @@ class ReproTest(CIBaseTest):
                   ]
 
         self.init()
-        self.perform_repro_test(targets)
+        try:
+            self.perform_repro_test(targets)
+        finally:
+            self.delete_from_build_dir('tmp')
 
 class CcacheTest(CIBaseTest):
 
-- 
2.20.1