kbuild: fix _kfselftest typo to _kselftest

kernelci/kbuild.py

@@ -1,4 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 #
 # Copyright (C) 2023 Collabora Limited
 # Author: Denys Fedoryshchenko <denys.f@collabora.com>
@@ -44,12 +44,12 @@
 from typing import Dict, Tuple, List
 
 CIP_CONFIG_URL = \
     "https://gitlab.com/cip-project/cip-kernel/cip-kernel-config/-/raw/master/{branch}/{config}"  # noqa
 CROS_CONFIG_URL = \
     "https://chromium.googlesource.com/chromiumos/third_party/kernel/+archive/refs/heads/{branch}/chromeos/config.tar.gz"  # noqa
 FW_GIT = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"  # noqa
 
 # TODO: find a way to automatically fetch this information
 LATEST_LTS_MAJOR = 6
 LATEST_LTS_MINOR = 12
 
@@ -106,19 +106,19 @@
 REDIR = ' > >(tee {}) 2> >(tee {} >&1)'
 
 
 def _download_file_inner(url, file_path):
     try:
         r = requests.get(url, stream=True, timeout=60)
     except requests.exceptions.RequestException as e:
         print(f"[_download_file_inner] Error: {e}")
         return False
     except requests.exceptions.Timeout as e:
         print(f"[_download_file_inner] Timeout: {e}")
         return False
     except requests.exceptions.ConnectionError as e:
         print(f"[_download_file_inner] Connection error: {e}")
         return False
     except Exception as e:
         print(f"[_download_file_inner] Exception: {e}")
         return False
     if r.status_code == 200:
@@ -143,13 +143,13 @@
     return False
 
 
 class KBuild():
     '''
     Build class that represents kernel build
     if node, jobname and params are provided, create new build object
     if jsonobj is provided, load class from serialized json
     '''
     def __init__(self, node=None, jobname=None, params=None, jsonobj=None, apiconfig=None,
                  fragment_configs=None):
         # Retrieve and store API token for future use
         self._api_token = os.environ.get('KCI_API_TOKEN')
@@ -188,9 +188,9 @@
             else:
                 self._dtbs_check = False
             if params.get('kselftest') == 'disable':
-                self._kfselftest = False
+                self._kselftest = False
             else:
-                self._kfselftest = True
+                self._kselftest = True
             self._apijobname = jobname
             self._steps = []
             self._artifacts = []
@@ -246,7 +246,8 @@
             )
             self._full_artifacts = jsonobj['full_artifacts']
             self._dtbs_check = jsonobj['dtbs_check']
-            self._kfselftest = jsonobj['kfselftest']
+            self._kselftest = jsonobj.get('kselftest',
+                                            jsonobj.get('kfselftest'))
             self._coverage = jsonobj.get('coverage', False)
             return
         raise ValueError("No valid arguments provided")
@@ -349,7 +350,7 @@
                 self._artifacts.append("build_kimage_stderr.log")
                 self._artifacts.append("build_modules.log")
                 self._artifacts.append("build_modules_stderr.log")
-                if self._kfselftest:
+                if self._kselftest:
                     self._artifacts.append("build_kselftest.log")
                     self._artifacts.append("build_kselftest_stderr.log")
                 # disable DTBS for some archs
@@ -657,8 +658,8 @@
         self.startjob("config_fragments")
         for fragfile in fragment_files:
             self.addcmd(f"./scripts/kconfig/merge_config.sh -m .config {fragfile}")
         # TODO: olddefconfig should be optional/configurable
         # TODO: log all warnings/errors of olddefconfig to separate file
         self.addcmd("make olddefconfig")
         self.addcmd(f"cp .config {self._af_dir}/")
         self.addcmd("cd ..")
@@ -719,15 +720,15 @@
             self._fetch_firmware()
             self._build_kernel()
             self._build_modules()
-            if self._kfselftest:
+            if self._kselftest:
                 self._build_kselftest()
             if self._arch not in DTBS_DISABLED:
                 self._build_dtbs()
             self._package_kimage()
             self._package_modules()
             if self._coverage:
                 self._package_coverage()
-            if self._kfselftest:
+            if self._kselftest:
                 self._package_kselftest()
             if self._arch not in DTBS_DISABLED:
                 self._package_dtbs()
@@ -802,7 +803,7 @@
             targets = ["kernel", "modules"]
             if self._arch not in DTBS_DISABLED:
                 targets.append("dtbs")
-            if self._kfselftest:
+            if self._kselftest:
                 targets.append("kselftest")
         cmd_parts.append(" ".join(targets))
         print(f"[_build_with_tuxmake] Building targets: {' '.join(targets)}")
@@ -1130,12 +1131,12 @@
                     os.unlink(upload_path)
 
                 print(f"[_upload_artifacts] Uploaded {artifact} to {stored_url}")
                 return artifact, stored_url, None
             except Exception as e:
                 print(f"[_upload_artifacts] Error uploading {artifact}: {e}")
                 if compressed_file and os.path.exists(upload_path):
                     os.unlink(upload_path)
                 return artifact, None, str(e)
 
         # Process uploads in parallel
         max_workers = min(10, len(upload_tasks))  # Limit concurrent uploads
@@ -1307,7 +1308,7 @@
         # Add child_nodes for each sub-step
 
         # do we have kselftest archive in artifact keys? then node is ok
-        if self._kfselftest:
+        if self._kselftest:
             kselftest_result = 'fail'
             for artifact in af_uri:
                 if artifact in ('kselftest_tar_xz', 'kselftest_tar_gz'):
@@ -1355,7 +1356,7 @@
 
         # if we have kselftest, we need to add child node
         # but only if build was successful
-        if self._kfselftest and job_result == 'pass':
+        if self._kselftest and job_result == 'pass':
             kselftest_node = self._node.copy()
             # remove id to not have same as parent
             kselftest_node.pop('id')