[PATCH 1/3] ci: Implement dynamic KFAIL checking

[Anton Mikanovich <amikan@ilbers.de>]

Remove KFAIL protection hardcoding and inctroduce ISAR_CI_KFAIL
environment variable instead.

Example:
ISAR_CI_KFAIL="cross_rpi cross_ubuntu nocross_rpi nocross_sidports"

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 testsuite/cibuilder.py | 54 ++++++++++++++++++++++++++++--------------
 testsuite/citest.py    | 30 +++++------------------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py
index 7ce13dc..98b8933 100755
--- a/testsuite/cibuilder.py
+++ b/testsuite/cibuilder.py
@@ -10,6 +10,7 @@ import tempfile
 
 import start_vm
 
+from avocado.core import exceptions
 from avocado import Test
 from avocado.utils import path
 from avocado.utils import process
@@ -124,6 +125,15 @@ class CIBuilder(Test):
         self.check_init()
         process.run('rm -rf ' + self.build_dir + '/' + path, sudo=True)
 
+    def is_in_list(self, envname):
+        test_prefix = 'test_'
+        caller = self._testMethodName
+        tests_list = (os.getenv(envname) or '').split()
+        if caller.startswith(test_prefix):
+            if caller[len(test_prefix):] in tests_list:
+                return True
+        return False
+
     def bitbake(self, target, bitbake_cmd=None, **kwargs):
         self.check_init()
         self.log.info('===================================================')
@@ -141,24 +151,30 @@ class CIBuilder(Test):
         else:
             cmdline.append(target)
 
-        with subprocess.Popen(" ".join(cmdline), stdout=subprocess.PIPE,
-                              stderr=subprocess.PIPE, universal_newlines=True,
-                              shell=True) as p1:
-            poller = select.poll()
-            poller.register(p1.stdout, select.POLLIN)
-            poller.register(p1.stderr, select.POLLIN)
-            while p1.poll() is None:
-                events = poller.poll(1000)
-                for fd, event in events:
-                    if event != select.POLLIN:
-                        continue
-                    if fd == p1.stdout.fileno():
-                        self.log.info(p1.stdout.readline().rstrip())
-                    if fd == p1.stderr.fileno():
-                        app_log.error(p1.stderr.readline().rstrip())
-            p1.wait()
-            if p1.returncode:
-                self.fail('Bitbake failed')
+        try:
+            with subprocess.Popen(" ".join(cmdline), stdout=subprocess.PIPE,
+                                  stderr=subprocess.PIPE, universal_newlines=True,
+                                  shell=True) as p1:
+                poller = select.poll()
+                poller.register(p1.stdout, select.POLLIN)
+                poller.register(p1.stderr, select.POLLIN)
+                while p1.poll() is None:
+                    events = poller.poll(1000)
+                    for fd, event in events:
+                        if event != select.POLLIN:
+                            continue
+                        if fd == p1.stdout.fileno():
+                            self.log.info(p1.stdout.readline().rstrip())
+                        if fd == p1.stderr.fileno():
+                            app_log.error(p1.stderr.readline().rstrip())
+                p1.wait()
+                if p1.returncode:
+                    self.fail('Bitbake failed')
+        except exceptions.TestFail:
+            if self.is_in_list('ISAR_CI_KFAIL'):
+                self.cancel('KFAIL')
+            else:
+                raise
 
     def backupfile(self, path):
         self.check_init()
@@ -258,4 +274,6 @@ class CIBuilder(Test):
                 else:
                     app_log.error(data.decode(errors='replace'))
 
+        if self.is_in_list('ISAR_CI_KFAIL'):
+            self.cancel('KFAIL: log ' + output_file)
         self.fail('Log ' + output_file)
diff --git a/testsuite/citest.py b/testsuite/citest.py
index 994c130..879c8d2 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -79,10 +79,7 @@ class CrossTest(CIBaseTest):
                   ]
 
         self.init()
-        try:
-            self.perform_build_test(targets, cross=True, debsrc_cache=True)
-        except:
-            self.cancel('KFAIL')
+        self.perform_build_test(targets, cross=True, debsrc_cache=True)
 
     def test_cross_ubuntu(self):
         targets = [
@@ -90,10 +87,7 @@ class CrossTest(CIBaseTest):
                   ]
 
         self.init()
-        try:
-            self.perform_build_test(targets, cross=True)
-        except:
-            self.cancel('KFAIL')
+        self.perform_build_test(targets, cross=True)
 
     def test_cross_bookworm(self):
         targets = [
@@ -101,10 +95,7 @@ class CrossTest(CIBaseTest):
                   ]
 
         self.init()
-        try:
-            self.perform_build_test(targets, cross=True)
-        except:
-            self.cancel('KFAIL')
+        self.perform_build_test(targets, cross=True)
 
 class SdkTest(CIBaseTest):
 
@@ -165,10 +156,7 @@ class NoCrossTest(CIBaseTest):
                   ]
 
         self.init()
-        try:
-            self.perform_build_test(targets, cross=False, debsrc_cache=True)
-        except:
-            self.cancel('KFAIL')
+        self.perform_build_test(targets, cross=False, debsrc_cache=True)
 
     def test_nocross_bookworm(self):
         targets = [
@@ -180,10 +168,7 @@ class NoCrossTest(CIBaseTest):
                   ]
 
         self.init()
-        try:
-            self.perform_build_test(targets, cross=False)
-        except:
-            self.cancel('KFAIL')
+        self.perform_build_test(targets, cross=False)
 
     def test_nocross_sidports(self):
         targets = [
@@ -192,10 +177,7 @@ class NoCrossTest(CIBaseTest):
                   ]
 
         self.init()
-        try:
-            self.perform_build_test(targets, cross=False)
-        except:
-            self.cancel('KFAIL')
+        self.perform_build_test(targets, cross=False)
 
 class RebuildTest(CIBaseTest):
 
-- 
2.17.1